diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-08-16 09:15:17 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-08-16 09:15:17 -0700 |
| commit | 05b20c034d5a1ffe64c15d155dd8511b77b8989b (patch) | |
| tree | 4e11e26722d0304b8e1499a63af4689dd2a3d7c6 | |
| parent | bcbb584569873a60acac3c733a9e81374447ea8c (diff) | |
| parent | c11f46259a1e8f4e7e58925aefd1ed9eaf57a7fc (diff) | |
| download | frameworks_base-05b20c034d5a1ffe64c15d155dd8511b77b8989b.zip frameworks_base-05b20c034d5a1ffe64c15d155dd8511b77b8989b.tar.gz frameworks_base-05b20c034d5a1ffe64c15d155dd8511b77b8989b.tar.bz2 | |
Merge "bootanimation: Don't open non-existing bootanimation.zip"
| -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; } } |