Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc800d40 authored by Nick Kralevich's avatar Nick Kralevich Committed by Android Git Automerger
Browse files

am fbd6d5a8: am 09fdc159: am 3ddee4de: Merge "[bootanimation] Drop user... 

am fbd6d5a8: am 09fdc159: am 3ddee4de: Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy."

* commit 'fbd6d5a8':
  [bootanimation] Drop user loadable bootanimation.zip abiltiy.
parents 0f3390f8 fbd6d5a8

cmds/bootanimation/BootAnimation.cpp

+0 −4
Original line number Diff line number Diff line
@@ -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;