From 825b6b0c0b4c4ff93e926db78e9b7acca3b993c5 Mon Sep 17 00:00:00 2001 From: Tim Kryger Date: Tue, 29 Nov 2016 13:33:29 -0800 Subject: Remove outdated reference to icon_installing.png The Wear recovery UI doesn't draw the installing icon but it was still trying to open it. Ever since these images were removed eight months ago, this has resulted in an error printing to the screen at runtime. Since the image wasn't really used, the lines to open it can simply be removed. Bug: 33203397 Change-Id: Id820f6d75e316c51d19b6095df407ecd61c0410e (cherry picked from commit 48be23c8ed0bcceda1abd80e1df4d1abc20f042f) --- wear_ui.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/wear_ui.cpp b/wear_ui.cpp index 11e5a7168..bdb0ef009 100644 --- a/wear_ui.cpp +++ b/wear_ui.cpp @@ -209,10 +209,12 @@ bool WearRecoveryUI::Init() { return false; } - LoadBitmap("icon_installing", &backgroundIcon[INSTALLING_UPDATE]); - backgroundIcon[ERASING] = backgroundIcon[INSTALLING_UPDATE]; LoadBitmap("icon_error", &backgroundIcon[ERROR]); backgroundIcon[NO_COMMAND] = backgroundIcon[ERROR]; + + // This leaves backgroundIcon[INSTALLING_UPDATE] and backgroundIcon[ERASING] + // as NULL which is fine since draw_background_locked() doesn't use them. + return true; } -- cgit v1.2.3