diff options
| author | Nick Kralevich <nnk@google.com> | 2013-12-16 18:44:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-16 18:44:04 +0000 |
| commit | fc800d407d695926ba07299c4e27d1e06284098f (patch) | |
| tree | c757c3f9d7830cc3d1faf8499620ebd6a0bf757b /cmds | |
| parent | 0f3390f846ed5ee63e3926b78878c7b75ee2f0c0 (diff) | |
| parent | fbd6d5a8f8f242ab5a079cc6ed12e2ebaa8bb226 (diff) | |
| download | frameworks_base-fc800d407d695926ba07299c4e27d1e06284098f.zip frameworks_base-fc800d407d695926ba07299c4e27d1e06284098f.tar.gz frameworks_base-fc800d407d695926ba07299c4e27d1e06284098f.tar.bz2 | |
am fbd6d5a8: am 09fdc159: am 3ddee4de: Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy."
* commit 'fbd6d5a8f8f242ab5a079cc6ed12e2ebaa8bb226':
[bootanimation] Drop user loadable bootanimation.zip abiltiy.
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/bootanimation/BootAnimation.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp index 5c265ab..1a2ab81 100644 --- a/cmds/bootanimation/BootAnimation.cpp +++ b/cmds/bootanimation/BootAnimation.cpp @@ -52,7 +52,6 @@ #include "BootAnimation.h" -#define USER_BOOTANIMATION_FILE "/data/local/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" @@ -285,9 +284,6 @@ status_t BootAnimation::readyToRun() { (access(SYSTEM_ENCRYPTED_BOOTANIMATION_FILE, R_OK) == 0) && ((zipFile = ZipFileRO::open(SYSTEM_ENCRYPTED_BOOTANIMATION_FILE)) != NULL)) || - ((access(USER_BOOTANIMATION_FILE, R_OK) == 0) && - ((zipFile = ZipFileRO::open(USER_BOOTANIMATION_FILE)) != NULL)) || - ((access(SYSTEM_BOOTANIMATION_FILE, R_OK) == 0) && ((zipFile = ZipFileRO::open(SYSTEM_BOOTANIMATION_FILE)) != NULL))) { mZip = zipFile; |