Merge "Fix the animation disappeared issue"

This commit is contained in:
Jean-Baptiste Queru
2010-11-03 10:16:30 -07:00
committed by Android Code Review

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;
}