summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-01-04 02:26:55 +0100
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-01-04 02:26:56 +0100
commit71633ebfb00103dd95a82cd813824dbddd9b905d (patch)
tree52cc49088cdd6c409fab6b5415fcb17ac45eab03
parentMerge "updater: Update the header name for bootloader.h." (diff)
parentRemove outdated reference to icon_installing.png (diff)
downloadandroid_bootable_recovery-71633ebfb00103dd95a82cd813824dbddd9b905d.tar
android_bootable_recovery-71633ebfb00103dd95a82cd813824dbddd9b905d.tar.gz
android_bootable_recovery-71633ebfb00103dd95a82cd813824dbddd9b905d.tar.bz2
android_bootable_recovery-71633ebfb00103dd95a82cd813824dbddd9b905d.tar.lz
android_bootable_recovery-71633ebfb00103dd95a82cd813824dbddd9b905d.tar.xz
android_bootable_recovery-71633ebfb00103dd95a82cd813824dbddd9b905d.tar.zst
android_bootable_recovery-71633ebfb00103dd95a82cd813824dbddd9b905d.zip
-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;
}