summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Kryger <tkryger@google.com>2016-11-29 22:33:29 +0100
committerTim Kryger <tkryger@google.com>2016-11-29 22:50:56 +0100
commit48be23c8ed0bcceda1abd80e1df4d1abc20f042f (patch)
tree83cde035778e2e40cba2af5391a7b08129868a88
parentDO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours am: 7ceb371048 -s ours am: b8c1788e7b -s ours am: 8837b0d25d -s ours (diff)
downloadandroid_bootable_recovery-48be23c8ed0bcceda1abd80e1df4d1abc20f042f.tar
android_bootable_recovery-48be23c8ed0bcceda1abd80e1df4d1abc20f042f.tar.gz
android_bootable_recovery-48be23c8ed0bcceda1abd80e1df4d1abc20f042f.tar.bz2
android_bootable_recovery-48be23c8ed0bcceda1abd80e1df4d1abc20f042f.tar.lz
android_bootable_recovery-48be23c8ed0bcceda1abd80e1df4d1abc20f042f.tar.xz
android_bootable_recovery-48be23c8ed0bcceda1abd80e1df4d1abc20f042f.tar.zst
android_bootable_recovery-48be23c8ed0bcceda1abd80e1df4d1abc20f042f.zip
Diffstat (limited to '')
-rw-r--r--wear_ui.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/wear_ui.cpp b/wear_ui.cpp
index bfa7097ea..660a078fc 100644
--- a/wear_ui.cpp
+++ b/wear_ui.cpp
@@ -204,10 +204,11 @@ void WearRecoveryUI::InitTextParams() {
void WearRecoveryUI::Init() {
ScreenRecoveryUI::Init();
- 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.
}
void WearRecoveryUI::SetStage(int current, int max)