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

Commit c552aca5 authored by Eric Biggers's avatar Eric Biggers
Browse files

Remove unused support for "encrypted" boot animations 

Since support for Full Disk Encryption was removed in favor of
File Based Encryption, "CryptKeeper mode" no longer exists and the
"vold.decrypt" system property is never set.  Therefore, remove the
unused code that supported showing special boot animations in this mode.

Bug: 208476087
Change-Id: I3fa2549338e1889dd9e9b381c60c264b95181b35
parent d46a6d2a

cmds/bootanimation/BootAnimation.cpp

+0 −19
Original line number Diff line number Diff line
@@ -71,8 +71,6 @@ static const char PRODUCT_BOOTANIMATION_DARK_FILE[] = "/product/media/bootanimat 
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";

static const char PRODUCT_SHUTDOWNANIMATION_FILE[] = "/product/media/shutdownanimation.zip";

static const char SYSTEM_SHUTDOWNANIMATION_FILE[] = "/system/media/shutdownanimation.zip";
@@ -652,23 +650,6 @@ bool BootAnimation::findBootAnimationFileInternal(const std::vector<std::string> 
}



void BootAnimation::findBootAnimationFile() {

    // If the device has encryption turned on or is in process

    // of being encrypted we show the encrypted boot animation.

    char decrypt[PROPERTY_VALUE_MAX];

    property_get("vold.decrypt", decrypt, "");



    bool encryptedAnimation = atoi(decrypt) != 0 ||

        !strcmp("trigger_restart_min_framework", decrypt);



    if (!mShuttingDown && encryptedAnimation) {

        static const std::vector<std::string> encryptedBootFiles = {

            PRODUCT_ENCRYPTED_BOOTANIMATION_FILE, SYSTEM_ENCRYPTED_BOOTANIMATION_FILE,

        };

        if (findBootAnimationFileInternal(encryptedBootFiles)) {

            return;

        }

    }



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

    static const std::vector<std::string> bootFiles = {

        APEX_BOOTANIMATION_FILE, playDarkAnim ? PRODUCT_BOOTANIMATION_DARK_FILE : PRODUCT_BOOTANIMATION_FILE,

cmds/bootanimation/FORMAT.md

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 


The system selects a boot animation zipfile from the following locations, in order:



    /system/media/bootanimation-encrypted.zip (if getprop("vold.decrypt") = '1')

    /system/media/bootanimation.zip

    /oem/media/bootanimation.zip