summaryrefslogtreecommitdiffstats
path: root/wear_ui.cpp
diff options
context:
space:
mode:
authorTim Kryger <tkryger@google.com>2016-12-16 01:54:38 +0100
committerandroid-build-merger <android-build-merger@google.com>2016-12-16 01:54:38 +0100
commita3e2f0b08230f03d50feae7861cb5ae9a75b5124 (patch)
tree513de317e9d85829106a688b28539326d64198b2 /wear_ui.cpp
parentMerge "Add update_bootloader_message() to fix two-step OTAs." am: 26d972c9d2 am: 9a707b08ef (diff)
parentresolve merge conflicts of 48be23c to nyc-mr1-dev-plus-aosp (diff)
downloadandroid_bootable_recovery-a3e2f0b08230f03d50feae7861cb5ae9a75b5124.tar
android_bootable_recovery-a3e2f0b08230f03d50feae7861cb5ae9a75b5124.tar.gz
android_bootable_recovery-a3e2f0b08230f03d50feae7861cb5ae9a75b5124.tar.bz2
android_bootable_recovery-a3e2f0b08230f03d50feae7861cb5ae9a75b5124.tar.lz
android_bootable_recovery-a3e2f0b08230f03d50feae7861cb5ae9a75b5124.tar.xz
android_bootable_recovery-a3e2f0b08230f03d50feae7861cb5ae9a75b5124.tar.zst
android_bootable_recovery-a3e2f0b08230f03d50feae7861cb5ae9a75b5124.zip
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 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;
}