commit 1e9abd4fff7fc7586b97aaa1ea0e99465105f061
author Treehugger Robot <treehugger-gerrit@google.com> Thu Apr 08 18:11:07 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Apr 08 18:11:07 2021 +0000
tree c28079aa691cc581b6e3a53741e3500c74b74afb
parent d56f6e14cd698a1d9fdafc8e7a273e902c51ebd3
parent a8b2ac4b30d9c441858ef104c66c8f8403648fe3

Merge "Populate `ro.boot.debug.sf.nobootanimation` from `android.bootanim`" am: a8b2ac4b30

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1666095

Change-Id: I0bd2a2df2f155a2526cdf66ed75bfa01f7b98571

init/property_service.cpp

diff --git a/init/property_service.cpp b/init/property_service.cpp
index 0dc8159..d1ba3c7 100644
--- a/init/property_service.cpp
+++ b/init/property_service.cpp
@@ -1200,6 +1200,10 @@
             // emulator specific, should be retired once emulator migrates to
             // androidboot.
             InitPropertySet("ro.boot." + key, value);
+        } else if (key == "android.bootanim" && value == "0") {
+            // emulator specific, should be retired once emulator migrates to
+            // androidboot.
+            InitPropertySet("ro.boot.debug.sf.nobootanimation", "1");
         }
     });
 }