diff options
| author | Robert Craig <rpcraig@tycho.ncsc.mil> | 2013-12-16 09:42:51 -0500 |
|---|---|---|
| committer | Robert Craig <rpcraig@tycho.ncsc.mil> | 2013-12-16 09:42:51 -0500 |
| commit | cee6a096b155582211f58bb3e541cf431c6ac3dc (patch) | |
| tree | 699911902474463f4f5e6c1f93c20f52f296e919 /cmds/bootanimation | |
| parent | a0ab49bb52f44eac97f81117d6864edd6a2e0487 (diff) | |
| download | frameworks_base-cee6a096b155582211f58bb3e541cf431c6ac3dc.zip frameworks_base-cee6a096b155582211f58bb3e541cf431c6ac3dc.tar.gz frameworks_base-cee6a096b155582211f58bb3e541cf431c6ac3dc.tar.bz2 | |
[bootanimation] Drop user loadable bootanimation.zip abiltiy.
A prior change removed the ability of
the shell to push to /data/local. Because
of this, the bootanimation code no longer
supports users loading custom bootanimation.zip
files. This patch drops the access attempt
from the code.
Change-Id: Ie30dd73699c8296be00dc6fbf14691e08baa6410
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
Diffstat (limited to 'cmds/bootanimation')
| -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; |