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

Commit 553d11e2 authored by Steve Kondik's avatar Steve Kondik
Browse files

Revert "bootanimation: Don't open non-existing bootanimation.zip" 

This reverts commit 67dbf762.
parent 1247cf84

cmds/bootanimation/BootAnimation.cpp

+6 −9
Original line number Diff line number Diff line
@@ -49,9 +49,6 @@ 


#include "BootAnimation.h"



#define USER_BOOTANIMATION_FILE "/data/local/bootanimation.zip"

#define SYSTEM_BOOTANIMATION_FILE "/system/media/bootanimation.zip"



namespace android {



// ---------------------------------------------------------------------------
@@ -247,12 +244,12 @@ status_t BootAnimation::readyToRun() { 
    mFlingerSurfaceControl = control;

    mFlingerSurface = s;



    mAndroidAnimation = true;

    if ((access(USER_BOOTANIMATION_FILE, R_OK) == 0) ||

        (access(SYSTEM_BOOTANIMATION_FILE, R_OK) == 0)) {

        if ((mZip.open(USER_BOOTANIMATION_FILE) != NO_ERROR) ||

            (mZip.open(SYSTEM_BOOTANIMATION_FILE) != NO_ERROR)) {

    mAndroidAnimation = false;

    status_t err = mZip.open("/data/local/bootanimation.zip");

    if (err != NO_ERROR) {

        err = mZip.open("/system/media/bootanimation.zip");

        if (err != NO_ERROR) {

            mAndroidAnimation = true;

        }

    }