aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Kryger2016-11-29 15:33:29 -0600
committerTao Bao2017-01-03 18:28:13 -0600
commit825b6b0c0b4c4ff93e926db78e9b7acca3b993c5 (patch)
tree70a3ff3b5f2582a87fed6e8cb68c75ce61e6d1d7 /wear_ui.cpp
parentb8d6523acfa463490585aa643ed2a1a2ea8f185b (diff)
downloadplatform-bootable-recovery-825b6b0c0b4c4ff93e926db78e9b7acca3b993c5.tar.gz
platform-bootable-recovery-825b6b0c0b4c4ff93e926db78e9b7acca3b993c5.tar.xz
platform-bootable-recovery-825b6b0c0b4c4ff93e926db78e9b7acca3b993c5.zip
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)
Diffstat (limited to 'wear_ui.cpp')
-rw-r--r--wear_ui.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/wear_ui.cpp b/wear_ui.cpp
index 11e5a716..bdb0ef00 100644
--- a/wear_ui.cpp
+++ b/wear_ui.cpp
@@ -209,10 +209,12 @@ bool WearRecoveryUI::Init() {
209 return false; 209 return false;
210 } 210 }
211 211
212 LoadBitmap("icon_installing", &backgroundIcon[INSTALLING_UPDATE]);
213 backgroundIcon[ERASING] = backgroundIcon[INSTALLING_UPDATE];
214 LoadBitmap("icon_error", &backgroundIcon[ERROR]); 212 LoadBitmap("icon_error", &backgroundIcon[ERROR]);
215 backgroundIcon[NO_COMMAND] = backgroundIcon[ERROR]; 213 backgroundIcon[NO_COMMAND] = backgroundIcon[ERROR];
214
215 // This leaves backgroundIcon[INSTALLING_UPDATE] and backgroundIcon[ERASING]
216 // as NULL which is fine since draw_background_locked() doesn't use them.
217
216 return true; 218 return true;
217} 219}
218 220