PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of 6aa6ddb to nyc-dev am: 771b6eb8d9

Browse Source 
am: 2a697feb39

Change-Id: Id1dcd42164121b4c31089c47fb56fb317da19896
This commit is contained in:
Alain Vongsouvanh
2016-06-08 15:51:48 +00:00
committed by android-build-merger
parent df956eceef 2a697feb39
commit 61da13a57f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wear_ui.cpp
+1 -1
View File
@@ -245,7 +245,7 @@ void WearRecoveryUI::progress_loop() {
if ((currentIcon == INSTALLING_UPDATE || currentIcon == ERASING) if ((currentIcon == INSTALLING_UPDATE || currentIcon == ERASING)
&& !show_text) { && !show_text) {
if (!intro_done) { if (!intro_done) {
if (current_frame == intro_frames - 1) { if (current_frame >= intro_frames - 1) {
intro_done = true; intro_done = true;
current_frame = 0; current_frame = 0;
} else { } else {