summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Kryger <tkryger@google.com>2016-11-29 22:33:29 +0100
committerTao Bao <tbao@google.com>2017-01-04 01:28:13 +0100
commit825b6b0c0b4c4ff93e926db78e9b7acca3b993c5 (patch)
tree70a3ff3b5f2582a87fed6e8cb68c75ce61e6d1d7
parentMerge "applypatch: Don't expose FindMatchingPatch()." (diff)
downloadandroid_bootable_recovery-825b6b0c0b4c4ff93e926db78e9b7acca3b993c5.tar
android_bootable_recovery-825b6b0c0b4c4ff93e926db78e9b7acca3b993c5.tar.gz
android_bootable_recovery-825b6b0c0b4c4ff93e926db78e9b7acca3b993c5.tar.bz2
android_bootable_recovery-825b6b0c0b4c4ff93e926db78e9b7acca3b993c5.tar.lz
android_bootable_recovery-825b6b0c0b4c4ff93e926db78e9b7acca3b993c5.tar.xz
android_bootable_recovery-825b6b0c0b4c4ff93e926db78e9b7acca3b993c5.tar.zst
android_bootable_recovery-825b6b0c0b4c4ff93e926db78e9b7acca3b993c5.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;
}