diff options
| author | 2013-12-16 18:28:42 +0000 | |
|---|---|---|
| committer | 2013-12-16 18:28:42 +0000 | |
| commit | 3ddee4dec9b7ae2265c356f5809eae73e1ef8796 (patch) | |
| tree | 000eb3882da7f06a634bc35c5c4238c2e7716435 /cmds/bootanimation/BootAnimation.cpp | |
| parent | 44291d9c2722e0d22dc6f909585f4302abdce205 (diff) | |
| parent | cee6a096b155582211f58bb3e541cf431c6ac3dc (diff) | |
Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy."
Diffstat (limited to 'cmds/bootanimation/BootAnimation.cpp')
| -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 5c265ab0ba1c..1a2ab81badc3 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; |