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

Merge 42c94791 from open-source master

Browse Source 
Change-Id: Id17a1a787b6d46c44ba39d628129a3a27f6d70be
This commit is contained in:
Jean-Baptiste Queru
2010-11-04 07:22:33 -07:00
parent c25c28a496 42c94791b0
commit 0d7c66b3a5
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;
mAndroidAnimation = true;
if ((access(USER_BOOTANIMATION_FILE, R_OK) == 0) ||
(access(SYSTEM_BOOTANIMATION_FILE, R_OK) == 0)) {
if ((mZip.open(USER_BOOTANIMATION_FILE) != NO_ERROR) ||
(mZip.open(SYSTEM_BOOTANIMATION_FILE) != NO_ERROR)) {
mAndroidAnimation = false;
}
}
if ((access(USER_BOOTANIMATION_FILE, R_OK) == 0) &&
(mZip.open(USER_BOOTANIMATION_FILE) == NO_ERROR) ||
(access(SYSTEM_BOOTANIMATION_FILE, R_OK) == 0) &&
(mZip.open(SYSTEM_BOOTANIMATION_FILE) == NO_ERROR))
mAndroidAnimation = false;
return NO_ERROR;
}