commit 0d7c66b3a555356315c17da48969fee28181ceda
author Jean-Baptiste Queru <jbq@google.com> Thu Nov 04 07:22:33 2010 -0700
committer Jean-Baptiste Queru <jbq@google.com> Thu Nov 04 07:22:44 2010 -0700
tree 7e2ee97d9ff616ba1a657ba3e2deb41befd05a83
parent c25c28a496012f64da57f5beb3b99f7424abb602
parent 42c94791b08022b9b214c1efb10b252567d1f0fa

Merge 42c94791 from open-source master

Change-Id: Id17a1a787b6d46c44ba39d628129a3a27f6d70be

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