resolve merge conflicts of 48be23c to nyc-mr1-dev-plus-aosp
Change-Id: Ia6c502d22d7fc42b5fc13b625f14643f3d7ddf44
diff --git a/wear_ui.cpp b/wear_ui.cpp
index 11e5a71..bdb0ef0 100644
--- a/wear_ui.cpp
+++ b/wear_ui.cpp
@@ -209,10 +209,12 @@
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;
}