Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 070cd3b5 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Gerrit Code Review
Browse files

bootanim: Cleanup 

Group all file selection logic within getAnimationFileName(), including
for themes

Change-Id: Ibca93defd92230d22195753899eda673ba9fc59d
parent 20e7bcc0

cmds/bootanimation/BootAnimation.cpp

+8 −7
Original line number Diff line number Diff line
@@ -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];

cmds/bootanimation/BootAnimation.h

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ private: 
    bool readFile(const char* name, String8& outString);

    bool movie();



    enum ImageID { IMG_DATA = 0, IMG_SYS = 1, IMG_ENC = 2 };

    enum ImageID { IMG_DATA = 0, IMG_SYS = 1, IMG_ENC = 2, IMG_THM = 3 };

    const char *getAnimationFileName(ImageID image);

    const char *getBootRingtoneFileName(ImageID image);

    void playBackgroundMusic();