diff options
| author | Jim Huang <jserv@0xlab.org> | 2010-08-10 03:12:15 +0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2010-08-16 17:20:01 -0400 |
| commit | 67dbf762bc8cd2c89403f2b476037426d1c651a1 (patch) | |
| tree | 9ee557e03a76328756cb18488afc4a1766e7861b | |
| parent | ac058e627a35238aa86ca2bc39cead02097d3578 (diff) | |
| download | frameworks_base-67dbf762bc8cd2c89403f2b476037426d1c651a1.zip frameworks_base-67dbf762bc8cd2c89403f2b476037426d1c651a1.tar.gz frameworks_base-67dbf762bc8cd2c89403f2b476037426d1c651a1.tar.bz2 | |
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
| -rw-r--r-- | cmds/bootanimation/BootAnimation.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp index ac2eb0d..f4b48b6 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; } } |