aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlain Vongsouvanh2016-06-08 10:30:48 -0500
committerAlain Vongsouvanh2016-06-08 10:30:48 -0500
commit771b6eb8d9fb53c7fc2a3beb0e29d3e2619f35fd (patch)
tree59cca0039f0daff64462f108cbe1404a679e4dd1 /wear_ui.cpp
parent7ce287d432dd3a4dc8841fc59e11ee1a0b7808a1 (diff)
parent6aa6ddb3c584dbf89739465bf2f703d8e1b28c26 (diff)
downloadplatform-bootable-recovery-771b6eb8d9fb53c7fc2a3beb0e29d3e2619f35fd.tar.gz
platform-bootable-recovery-771b6eb8d9fb53c7fc2a3beb0e29d3e2619f35fd.tar.xz
platform-bootable-recovery-771b6eb8d9fb53c7fc2a3beb0e29d3e2619f35fd.zip
resolve merge conflicts of 6aa6ddb to nyc-dev
Change-Id: I3696fe3e86e0222c7c26b0aa2bf1dd8e03ac5315
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 2502313f..b437fd0a 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 {