diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-11-03 10:16:30 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-11-03 10:16:30 -0700 |
| commit | 42c94791b08022b9b214c1efb10b252567d1f0fa (patch) | |
| tree | 1dd4b37421a49568191c4c37eb65f24b672ef1f2 /cmds | |
| parent | 9df48a0305818122298a86ae9949f6688814928b (diff) | |
| parent | 2978751310b4efef1faa87b116fcaee9423c007f (diff) | |
| download | frameworks_base-42c94791b08022b9b214c1efb10b252567d1f0fa.zip frameworks_base-42c94791b08022b9b214c1efb10b252567d1f0fa.tar.gz frameworks_base-42c94791b08022b9b214c1efb10b252567d1f0fa.tar.bz2 | |
Merge "Fix the animation disappeared issue"
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/bootanimation/BootAnimation.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp index f4b48b6..12c9fe5 100644 --- a/cmds/bootanimation/BootAnimation.cpp +++ b/cmds/bootanimation/BootAnimation.cpp @@ -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; } |