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

Commit b5b13e51 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Migrate from android::String isEmpty to empty [bootanimation]" into... 

Merge "Migrate from android::String isEmpty to empty [bootanimation]" into main am: 1de56955 am: 757b0507 am: 94faa189 am: 4d51bc3d am: 34a4089b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2725975



Change-Id: I4c1ea79beb47456766940332593553e1e012c7b7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9734602a 34a4089b

cmds/bootanimation/BootAnimation.cpp

+2 −2
Original line number Diff line number Diff line
@@ -723,7 +723,7 @@ void BootAnimation::resizeSurface(int newWidth, int newHeight) { 
bool BootAnimation::preloadAnimation() {

    ATRACE_CALL();

    findBootAnimationFile();

    if (!mZipFileName.isEmpty()) {

    if (!mZipFileName.empty()) {

        mAnimation = loadAnimation(mZipFileName);

        return (mAnimation != nullptr);

    }
@@ -842,7 +842,7 @@ bool BootAnimation::threadLoop() { 


    // We have no bootanimation file, so we use the stock android logo

    // animation.

    if (mZipFileName.isEmpty()) {

    if (mZipFileName.empty()) {

        ALOGD("No animation file");

        result = android();

    } else {