diff options
| author | 2019-05-24 14:06:15 +0000 | |
|---|---|---|
| committer | 2019-05-24 14:06:15 +0000 | |
| commit | 731490a14297c11a0adadfbf9df2196d14db5cbf (patch) | |
| tree | f7940652e19e0576f1bb0551f2c0b2ac9856c379 /cmds/bootanimation/BootAnimation.cpp | |
| parent | 35ea195df6ef1a9bc8bed03e160ad5afd8b13de4 (diff) | |
| parent | 34ffe253cebada34609c320fe5d11761be039a80 (diff) | |
Merge "Write system property persist.sys.provisioned" into qt-dev
Diffstat (limited to 'cmds/bootanimation/BootAnimation.cpp')
| -rw-r--r-- | cmds/bootanimation/BootAnimation.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp index 8e7277c55ed8..16af0719d9dd 100644 --- a/cmds/bootanimation/BootAnimation.cpp +++ b/cmds/bootanimation/BootAnimation.cpp @@ -66,6 +66,7 @@ namespace android { 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 PRODUCT_ENCRYPTED_BOOTANIMATION_FILE[] = "/product/media/bootanimation-encrypted.zip"; @@ -141,7 +142,6 @@ sp<SurfaceComposerClient> BootAnimation::session() const { return mSession; } - void BootAnimation::binderDied(const wp<IBinder>&) { // woah, surfaceflinger died! @@ -355,8 +355,11 @@ void BootAnimation::findBootAnimationFile() { } } } + + const bool playDarkAnim = android::base::GetIntProperty("ro.boot.theme", 0) == 1; static const char* bootFiles[] = - {PRODUCT_BOOTANIMATION_FILE, OEM_BOOTANIMATION_FILE, SYSTEM_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}; |