diff options
| author | Nick Kralevich <nnk@google.com> | 2013-12-16 18:47:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-16 18:47:03 +0000 |
| commit | 9d7d4da6b719594a89b4b8b17546f6601b617f33 (patch) | |
| tree | 863cd571b02ee37919f5713964491d7da13b3063 /cmds | |
| parent | d9a32847e51f19822937dc9b916e8b7ea5f50df7 (diff) | |
| parent | fc800d407d695926ba07299c4e27d1e06284098f (diff) | |
| download | frameworks_base-9d7d4da6b719594a89b4b8b17546f6601b617f33.zip frameworks_base-9d7d4da6b719594a89b4b8b17546f6601b617f33.tar.gz frameworks_base-9d7d4da6b719594a89b4b8b17546f6601b617f33.tar.bz2 | |
am fc800d40: am fbd6d5a8: am 09fdc159: am 3ddee4de: Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy."
* commit 'fc800d407d695926ba07299c4e27d1e06284098f':
[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 a7ced44..125bea6 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; |