diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-11-04 10:57:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-04 10:57:34 -0700 |
| commit | e9418ffc5bb5ab443452af938e733a54cabdf9d7 (patch) | |
| tree | 6a26126693935b075b485a72ec47439e6eacaf85 /cmds | |
| parent | 10644106b819acad4f88c3882d5688638951728c (diff) | |
| parent | 0d7c66b3a555356315c17da48969fee28181ceda (diff) | |
| download | frameworks_base-e9418ffc5bb5ab443452af938e733a54cabdf9d7.zip frameworks_base-e9418ffc5bb5ab443452af938e733a54cabdf9d7.tar.gz frameworks_base-e9418ffc5bb5ab443452af938e733a54cabdf9d7.tar.bz2 | |
am 0d7c66b3: Merge 42c94791 from open-source master
* commit '0d7c66b3a555356315c17da48969fee28181ceda':
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 9fe1fb8..6650a71 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; } |