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

Commit c11f4625 authored by Jim Huang's avatar Jim Huang
Browse files

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

While booting from AOSP image, logcat always complains as following:
W/zipro   ( 1001): Unable to open zip '/data/local/bootanimation.zip':
No such file or directory
W/zipro   ( 1001): Unable to open zip '/system/media/bootanimation.zip':
No such file or directory

This patch avoids opening non-existing files.

Change-Id: I54cc03f125a5e16dbc930515bd2e43c623b63f8f
parent 0f0dd448

cmds/bootanimation/BootAnimation.cpp

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


#include "BootAnimation.h"



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

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



namespace android {



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

    mFlingerSurface = s;



    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;

    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;

        }

    }