Merge "Conditionally show bootanimation for quiescent boots" into sc-dev

2021-04-26 10:59:51 +00:00
parent 2f8d1baa63 8c878d61bb
commit 79ff669777
1 changed files with 8 additions and 1 deletions
--- a/cmds/bootanimation/BootAnimationUtil.cpp
+++ b/cmds/bootanimation/BootAnimationUtil.cpp
@@ -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() {