aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlain Vongsouvanh2016-06-08 10:46:40 -0500
committerandroid-build-merger2016-06-08 10:46:40 -0500
commit2a697feb3931a053a5c72913a461db7210119087 (patch)
tree22ab385aa7c9a8437e35a96a0f059b1c4cbf7fd7 /wear_ui.cpp
parent64f46fb16ccae69f7a826585c5eaba48fe1b05da (diff)
parent771b6eb8d9fb53c7fc2a3beb0e29d3e2619f35fd (diff)
downloadplatform-bootable-recovery-2a697feb3931a053a5c72913a461db7210119087.tar.gz
platform-bootable-recovery-2a697feb3931a053a5c72913a461db7210119087.tar.xz
platform-bootable-recovery-2a697feb3931a053a5c72913a461db7210119087.zip
resolve merge conflicts of 6aa6ddb to nyc-dev
am: 771b6eb8d9 Change-Id: Ie0dabf5fb0930b75117193ae31e73df62d885903
Diffstat (limited to 'wear_ui.cpp')
-rw-r--r--wear_ui.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/wear_ui.cpp b/wear_ui.cpp
index 5451ed1a..e078134c 100644
--- a/wear_ui.cpp
+++ b/wear_ui.cpp
@@ -245,7 +245,7 @@ void WearRecoveryUI::progress_loop() {
245 if ((currentIcon == INSTALLING_UPDATE || currentIcon == ERASING) 245 if ((currentIcon == INSTALLING_UPDATE || currentIcon == ERASING)
246 && !show_text) { 246 && !show_text) {
247 if (!intro_done) { 247 if (!intro_done) {
248 if (current_frame == intro_frames - 1) { 248 if (current_frame >= intro_frames - 1) {
249 intro_done = true; 249 intro_done = true;
250 current_frame = 0; 250 current_frame = 0;
251 } else { 251 } else {