diff options
| author | Marcos Marado <mmarado@cyngn.com> | 2016-05-12 12:50:28 +0100 |
|---|---|---|
| committer | Marcos Marado <mmarado@cyngn.com> | 2016-05-12 06:13:49 -0700 |
| commit | 5e5aaf9a995858a8144429fa34c6dcecb1ad868a (patch) | |
| tree | 4707641ece84e59f2922cba3a783727e8d109fb1 /cmds/bootanimation | |
| parent | af23a1896157be322e340a7da80bf83a6a9e7356 (diff) | |
| download | frameworks_base-5e5aaf9a995858a8144429fa34c6dcecb1ad868a.zip frameworks_base-5e5aaf9a995858a8144429fa34c6dcecb1ad868a.tar.gz frameworks_base-5e5aaf9a995858a8144429fa34c6dcecb1ad868a.tar.bz2 | |
bootanimation: fix check for system bootanimation
We already check for the system bootanimation the proper way (using the
getAnimationFileName function), so we shouldn't have re-added the clause to
check it "the old way".
As it was, if there is a system bootanimation on the traditional path, an
alternative system bootanimation provided by getAnimationFileName would not be
used.
Change-Id: I73178d6b819c40e120c42fe10cb20afe171b8d4e
Bug-Id: PAELLA-112
Diffstat (limited to 'cmds/bootanimation')
| -rw-r--r-- | cmds/bootanimation/BootAnimation.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp index 9b8b135..da3026d 100644 --- a/cmds/bootanimation/BootAnimation.cpp +++ b/cmds/bootanimation/BootAnimation.cpp @@ -414,9 +414,6 @@ status_t BootAnimation::readyToRun() { ((access(OEM_BOOTANIMATION_FILE, R_OK) == 0) && ((zipFile = ZipFileRO::open(OEM_BOOTANIMATION_FILE)) != NULL)) || - ((access(SYSTEM_BOOTANIMATION_FILE, R_OK) == 0) && - ((zipFile = ZipFileRO::open(SYSTEM_BOOTANIMATION_FILE)) != NULL)) || - ((access(getAnimationFileName(IMG_DATA), R_OK) == 0) && ((zipFile = ZipFileRO::open(getAnimationFileName(IMG_DATA))) != NULL)) || |