Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the animation disappeared issue"

Browse Source
This commit is contained in:
Jean-Baptiste Queru
2010-11-03 10:16:30 -07:00
committed by Android Code Review
parent 9df48a0305 2978751310
commit 42c94791b0
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmds/bootanimation/BootAnimation.cpp
View File

@@ -248,13 +248,11 @@ status_t BootAnimation::readyToRun() {
mFlingerSurface = s; mFlingerSurface = s;
mAndroidAnimation = true; mAndroidAnimation = true;
if ((access(USER_BOOTANIMATION_FILE, R_OK) == 0) || if ((access(USER_BOOTANIMATION_FILE, R_OK) == 0) &&
(access(SYSTEM_BOOTANIMATION_FILE, R_OK) == 0)) { (mZip.open(USER_BOOTANIMATION_FILE) == NO_ERROR) ||
if ((mZip.open(USER_BOOTANIMATION_FILE) != NO_ERROR) || (access(SYSTEM_BOOTANIMATION_FILE, R_OK) == 0) &&
(mZip.open(SYSTEM_BOOTANIMATION_FILE) != NO_ERROR)) { (mZip.open(SYSTEM_BOOTANIMATION_FILE) == NO_ERROR))
mAndroidAnimation = false; mAndroidAnimation = false;
}
}
return NO_ERROR; return NO_ERROR;
} }