diff options
Diffstat (limited to 'cmds/bootanimation/BootAnimation.cpp')
| -rw-r--r-- | cmds/bootanimation/BootAnimation.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp index da3026d..5afe1e8 100644 --- a/cmds/bootanimation/BootAnimation.cpp +++ b/cmds/bootanimation/BootAnimation.cpp @@ -73,6 +73,7 @@ #define OEM_SHUTDOWN_ANIMATION_FILE "/oem/media/shutdownanimation.zip" #define SYSTEM_SHUTDOWN_ANIMATION_FILE "/system/media/shutdownanimation.zip" #define SYSTEM_ENCRYPTED_SHUTDOWN_ANIMATION_FILE "/system/media/shutdownanimation-encrypted.zip" +#define THEME_SHUTDOWN_ANIMATION_FILE "/data/system/theme/shutdownanimation.zip" #define OEM_BOOT_MUSIC_FILE "/oem/media/boot.wav" #define SYSTEM_BOOT_MUSIC_FILE "/system/media/boot.wav" @@ -408,11 +409,9 @@ status_t BootAnimation::readyToRun() { (access(getAnimationFileName(IMG_ENC), R_OK) == 0) && ((zipFile = ZipFileRO::open(getAnimationFileName(IMG_ENC))) != NULL)) || - ((access(THEME_BOOTANIMATION_FILE, R_OK) == 0) && - ((zipFile = ZipFileRO::open(THEME_BOOTANIMATION_FILE)) != NULL)) || + ((access(getAnimationFileName(IMG_THM), R_OK) == 0) && + ((zipFile = ZipFileRO::open(getAnimationFileName(IMG_THM))) != NULL)) || - ((access(OEM_BOOTANIMATION_FILE, R_OK) == 0) && - ((zipFile = ZipFileRO::open(OEM_BOOTANIMATION_FILE)) != NULL)) || ((access(getAnimationFileName(IMG_DATA), R_OK) == 0) && ((zipFile = ZipFileRO::open(getAnimationFileName(IMG_DATA))) != NULL)) || @@ -885,12 +884,14 @@ bool BootAnimation::movie() const char *BootAnimation::getAnimationFileName(ImageID image) { - const char *fileName[2][3] = { { OEM_BOOTANIMATION_FILE, + const char *fileName[2][4] = { { OEM_BOOTANIMATION_FILE, SYSTEM_BOOTANIMATION_FILE, - SYSTEM_ENCRYPTED_BOOTANIMATION_FILE }, { + SYSTEM_ENCRYPTED_BOOTANIMATION_FILE, + THEME_BOOTANIMATION_FILE }, { OEM_SHUTDOWN_ANIMATION_FILE, SYSTEM_SHUTDOWN_ANIMATION_FILE, - SYSTEM_ENCRYPTED_SHUTDOWN_ANIMATION_FILE} }; + SYSTEM_ENCRYPTED_SHUTDOWN_ANIMATION_FILE, + THEME_SHUTDOWN_ANIMATION_FILE} }; int state; char sku[PROPERTY_VALUE_MAX]; char skusuffix[PATH_MAX]; |