commit e9418ffc5bb5ab443452af938e733a54cabdf9d7
author Jean-Baptiste Queru <jbq@google.com> Thu Nov 04 10:57:34 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Nov 04 10:57:34 2010 -0700
tree 6a26126693935b075b485a72ec47439e6eacaf85
parent 10644106b819acad4f88c3882d5688638951728c
parent 0d7c66b3a555356315c17da48969fee28181ceda

am 0d7c66b3: Merge 42c94791 from open-source master

* commit '0d7c66b3a555356315c17da48969fee28181ceda':
  Fix the animation disappeared issue

cmds/bootanimation/BootAnimation.cpp

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