Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 05b20c03: Merge "bootanimation: Don\'t open non-existing bootanimation.zip"

Browse Source 
Merge commit '05b20c034d5a1ffe64c15d155dd8511b77b8989b' into gingerbread-plus-aosp

* commit '05b20c034d5a1ffe64c15d155dd8511b77b8989b':
  bootanimation: Don't open non-existing bootanimation.zip
This commit is contained in:
Jean-Baptiste Queru
2010-08-17 07:48:26 -07:00
committed by Android Git Automerger
parent 1a0b19b324 05b20c034d
commit 18dd95f451
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cmds/bootanimation/BootAnimation.cpp
View File

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