From e9875b6c1ca649a6285862f309e2271c3b54cada Mon Sep 17 00:00:00 2001 From: Chih-Wei Huang Date: Wed, 3 Nov 2010 15:33:00 +0800 Subject: [PATCH] Fix the animation disappeared issue The animation movie disappears due to the incorrect logic of commit c11f46259a1e8f4e7e58925aefd1ed9eaf57a7fc. Change-Id: I9c0eac2bf2950fe20e931da367036ddf38d81f52 --- cmds/bootanimation/BootAnimation.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp index f4b48b693555..12c9fe502220 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; } -- 2.11.0