Skip to content

Commit 5ad384c

Browse files
committed
bootanimation: Fix preload of shutdown & themed animations
* Use getAnimationFileName instead of using hardcoded paths * Add check for theme animation Change-Id: I28b8de9a720db268619a01c18d0fb22cd1c6e748
1 parent d1274eb commit 5ad384c

1 file changed

Lines changed: 8 additions & 7 deletions

File tree

cmds/bootanimation/BootAnimation.cpp

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,6 @@ status_t BootAnimation::readyToRun() {
429429
((access(getAnimationFileName(IMG_THM), R_OK) == 0) &&
430430
((zipFile = ZipFileRO::open(getAnimationFileName(IMG_THM))) != NULL)) ||
431431

432-
433432
((access(getAnimationFileName(IMG_DATA), R_OK) == 0) &&
434433
((zipFile = ZipFileRO::open(getAnimationFileName(IMG_DATA))) != NULL)) ||
435434

@@ -442,12 +441,14 @@ status_t BootAnimation::readyToRun() {
442441
// Preload the bootanimation zip on memory, so we don't stutter
443442
// when showing the animation
444443
FILE* fd;
445-
if (encryptedAnimation && access(SYSTEM_ENCRYPTED_BOOTANIMATION_FILE, R_OK) == 0)
446-
fd = fopen(SYSTEM_ENCRYPTED_BOOTANIMATION_FILE, "r");
447-
else if (access(OEM_BOOTANIMATION_FILE, R_OK) == 0)
448-
fd = fopen(OEM_BOOTANIMATION_FILE, "r");
449-
else if (access(SYSTEM_BOOTANIMATION_FILE, R_OK) == 0)
450-
fd = fopen(SYSTEM_BOOTANIMATION_FILE, "r");
444+
if (encryptedAnimation && access(getAnimationFileName(IMG_ENC), R_OK) == 0)
445+
fd = fopen(getAnimationFileName(IMG_ENC), "r");
446+
else if (access(getAnimationFileName(IMG_THM), R_OK) == 0)
447+
fd = fopen(getAnimationFileName(IMG_THM), "r");
448+
else if (access(getAnimationFileName(IMG_DATA), R_OK) == 0)
449+
fd = fopen(getAnimationFileName(IMG_DATA), "r");
450+
else if (access(getAnimationFileName(IMG_SYS), R_OK) == 0)
451+
fd = fopen(getAnimationFileName(IMG_SYS), "r");
451452
else
452453
return NO_ERROR;
453454

0 commit comments

Comments
 (0)