diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2016-12-16 01:37:03 +0100 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-12-16 01:37:04 +0100 |
commit | 910c83b915cc1c9f1dc28443f2ccf38514ffef9b (patch) | |
tree | 513de317e9d85829106a688b28539326d64198b2 | |
parent | Merge "Add update_bootloader_message() to fix two-step OTAs." am: 26d972c9d2 (diff) | |
parent | resolve merge conflicts of 48be23c to nyc-mr1-dev-plus-aosp (diff) | |
download | android_bootable_recovery-910c83b915cc1c9f1dc28443f2ccf38514ffef9b.tar android_bootable_recovery-910c83b915cc1c9f1dc28443f2ccf38514ffef9b.tar.gz android_bootable_recovery-910c83b915cc1c9f1dc28443f2ccf38514ffef9b.tar.bz2 android_bootable_recovery-910c83b915cc1c9f1dc28443f2ccf38514ffef9b.tar.lz android_bootable_recovery-910c83b915cc1c9f1dc28443f2ccf38514ffef9b.tar.xz android_bootable_recovery-910c83b915cc1c9f1dc28443f2ccf38514ffef9b.tar.zst android_bootable_recovery-910c83b915cc1c9f1dc28443f2ccf38514ffef9b.zip |
Diffstat (limited to '')
-rw-r--r-- | wear_ui.cpp | 6 |
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; } |