diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2014-04-16 09:41:58 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2014-04-28 08:54:17 -0700 |
| commit | 28f0877073e0ebc59f1eeeb6e0d54b614b9d3fa5 (patch) | |
| tree | 715d463e05f8f558335a9919e038334d51460a6d /cmds | |
| parent | bdd4491b322bebd96b99da508ec7b0b7d59d97ae (diff) | |
| download | frameworks_base-28f0877073e0ebc59f1eeeb6e0d54b614b9d3fa5.zip frameworks_base-28f0877073e0ebc59f1eeeb6e0d54b614b9d3fa5.tar.gz frameworks_base-28f0877073e0ebc59f1eeeb6e0d54b614b9d3fa5.tar.bz2 | |
Allow custom wallpaper and boot animation.
Add new "ro.config.wallpaper" and "ro.config.wallpaper_component"
properties which may be defined outside of the bundled framework
resources. Falls back to bundled resources when properties are
undefined.
Also look for boot animation under OEM partition.
Bug: 13340779
Change-Id: Ibdc9935dbdaae3319bf63b40573de0503d82ae67
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/bootanimation/BootAnimation.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp index 41afa39..1780e03 100644 --- a/cmds/bootanimation/BootAnimation.cpp +++ b/cmds/bootanimation/BootAnimation.cpp @@ -51,6 +51,7 @@ #include "BootAnimation.h" +#define OEM_BOOTANIMATION_FILE "/oem/media/bootanimation.zip" #define SYSTEM_BOOTANIMATION_FILE "/system/media/bootanimation.zip" #define SYSTEM_ENCRYPTED_BOOTANIMATION_FILE "/system/media/bootanimation-encrypted.zip" #define EXIT_PROP_NAME "service.bootanim.exit" @@ -283,6 +284,9 @@ status_t BootAnimation::readyToRun() { (access(SYSTEM_ENCRYPTED_BOOTANIMATION_FILE, R_OK) == 0) && ((zipFile = ZipFileRO::open(SYSTEM_ENCRYPTED_BOOTANIMATION_FILE)) != NULL)) || + ((access(OEM_BOOTANIMATION_FILE, R_OK) == 0) && + ((zipFile = ZipFileRO::open(OEM_BOOTANIMATION_FILE)) != NULL)) || + ((access(SYSTEM_BOOTANIMATION_FILE, R_OK) == 0) && ((zipFile = ZipFileRO::open(SYSTEM_BOOTANIMATION_FILE)) != NULL))) { mZip = zipFile; |