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

Commit 2cefc06c authored by Robert Horvath's avatar Robert Horvath Committed by Automerger Merge Worker
Browse files

Merge "Conditionally show bootanimation for quiescent boots" into sc-dev am: 79ff6697

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

Change-Id: I6efbc67c44482f4ea06fb2cafe112d5e0a317919
parents 0b698a39 79ff6697
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
@@ -49,7 +49,14 @@ bool bootAnimationDisabled() {
    }

    property_get("ro.boot.quiescent", value, "0");
    return atoi(value) > 0;
    if (atoi(value) > 0) {
        // Only show the bootanimation for quiescent boots if this system property is set to enabled
        if (!property_get_bool("ro.bootanim.quiescent.enabled", false)) {
            return true;
        }
    }

    return false;
}

void waitForSurfaceFlinger() {