From cee6a096b155582211f58bb3e541cf431c6ac3dc Mon Sep 17 00:00:00 2001 From: Robert Craig Date: Mon, 16 Dec 2013 09:42:51 -0500 Subject: [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 --- cmds/bootanimation/BootAnimation.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'cmds/bootanimation') 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; -- cgit v1.1