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

Commit e9418ffc authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 0d7c66b3: Merge 42c94791 from open-source master 

* commit '0d7c66b3':
  Fix the animation disappeared issue
parents 10644106 0d7c66b3

cmds/bootanimation/BootAnimation.cpp

+5 −7
Original line number Diff line number Diff line
@@ -248,13 +248,11 @@ status_t BootAnimation::readyToRun() { 
    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)) {

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

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

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

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

        mAndroidAnimation = false;

        }

    }



    return NO_ERROR;

}