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

Commit 0b33c85d authored by Anders Fridlund's avatar Anders Fridlund Committed by android-build-merger
Browse files

Merge "Look for bootanimation in apex-module" into qt-dev am: 36e3da79 

am: 0dd52a59

Change-Id: I4193bb1920e1f42a4b3737b10266c8bc88c91a37
parents 47398bb2 0dd52a59

cmds/bootanimation/BootAnimation.cpp

+3 −2
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ static const char OEM_BOOTANIMATION_FILE[] = "/oem/media/bootanimation.zip"; 
static const char PRODUCT_BOOTANIMATION_DARK_FILE[] = "/product/media/bootanimation-dark.zip";

static const char PRODUCT_BOOTANIMATION_FILE[] = "/product/media/bootanimation.zip";

static const char SYSTEM_BOOTANIMATION_FILE[] = "/system/media/bootanimation.zip";

static const char APEX_BOOTANIMATION_FILE[] = "/apex/com.android.bootanimation/etc/bootanimation.zip";

static const char PRODUCT_ENCRYPTED_BOOTANIMATION_FILE[] = "/product/media/bootanimation-encrypted.zip";

static const char SYSTEM_ENCRYPTED_BOOTANIMATION_FILE[] = "/system/media/bootanimation-encrypted.zip";

static const char OEM_SHUTDOWNANIMATION_FILE[] = "/oem/media/shutdownanimation.zip";
@@ -358,10 +359,10 @@ void BootAnimation::findBootAnimationFile() { 


    const bool playDarkAnim = android::base::GetIntProperty("ro.boot.theme", 0) == 1;

    static const char* bootFiles[] =

        {playDarkAnim ? PRODUCT_BOOTANIMATION_DARK_FILE : PRODUCT_BOOTANIMATION_FILE,

        {APEX_BOOTANIMATION_FILE, playDarkAnim ? PRODUCT_BOOTANIMATION_DARK_FILE : PRODUCT_BOOTANIMATION_FILE,

         OEM_BOOTANIMATION_FILE, SYSTEM_BOOTANIMATION_FILE};

    static const char* shutdownFiles[] =

        {PRODUCT_SHUTDOWNANIMATION_FILE, OEM_SHUTDOWNANIMATION_FILE, SYSTEM_SHUTDOWNANIMATION_FILE};

        {PRODUCT_SHUTDOWNANIMATION_FILE, OEM_SHUTDOWNANIMATION_FILE, SYSTEM_SHUTDOWNANIMATION_FILE, ""};



    for (const char* f : (!mShuttingDown ? bootFiles : shutdownFiles)) {

        if (access(f, R_OK) == 0) {