From b95b304173aab9665b5cf265581bb64d0d6cf0f1 Mon Sep 17 00:00:00 2001 From: Jim Huang Date: Tue, 10 Aug 2010 03:12:15 +0800 Subject: [PATCH] bootanimation: Don't open non-existing bootanimation.zip While booting from AOSP image, logcat always complains as following: W/zipro ( 1001): Unable to open zip '/data/local/bootanimation.zip': No such file or directory W/zipro ( 1001): Unable to open zip '/system/media/bootanimation.zip': No such file or directory This patch avoids opening non-existing files. Change-Id: I54cc03f125a5e16dbc930515bd2e43c623b63f8f --- cmds/bootanimation/BootAnimation.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp index 7a7f8ed35215..9fe1fb841273 100644 --- a/cmds/bootanimation/BootAnimation.cpp +++ b/cmds/bootanimation/BootAnimation.cpp @@ -49,6 +49,9 @@ #include "BootAnimation.h" +#define USER_BOOTANIMATION_FILE "/data/local/bootanimation.zip" +#define SYSTEM_BOOTANIMATION_FILE "/system/media/bootanimation.zip" + namespace android { // --------------------------------------------------------------------------- @@ -244,12 +247,12 @@ status_t BootAnimation::readyToRun() { mFlingerSurfaceControl = control; mFlingerSurface = s; - mAndroidAnimation = false; - status_t err = mZip.open("/data/local/bootanimation.zip"); - if (err != NO_ERROR) { - err = mZip.open("/system/media/bootanimation.zip"); - if (err != NO_ERROR) { - mAndroidAnimation = true; + 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; } } -- 2.11.0