commit 82d21c4b89f7a5374d397733e1764005cc35b517
author Nikita Ioffe <ioffe@google.com> Thu Mar 19 16:42:19 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 19 16:42:19 2020 +0000
tree 7c6181f4de9b048b2310f4473cd1f2d2c332f1e0
parent a7aededa7dafdeb1d15cad28e98eadba78b2c0bb
parent 22216c69260881be5e4c125198dcdddfa1893e3b

Merge "RFC: don't turn screen on after userspace reboot" into rvc-dev

services/core/java/com/android/server/power/PowerManagerService.java

diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java
index 3257b63..4bc95ae 100644
--- a/services/core/java/com/android/server/power/PowerManagerService.java
+++ b/services/core/java/com/android/server/power/PowerManagerService.java
@@ -77,6 +77,7 @@
 import android.service.dreams.DreamManagerInternal;
 import android.service.vr.IVrManager;
 import android.service.vr.IVrStateCallbacks;
+import android.sysprop.InitProperties;
 import android.util.KeyValueListParser;
 import android.util.PrintWriterPrinter;
 import android.util.Slog;
@@ -968,7 +969,8 @@
             mHalInteractiveModeEnabled = true;
 
             mWakefulnessRaw = WAKEFULNESS_AWAKE;
-            sQuiescent = mSystemProperties.get(SYSTEM_PROPERTY_QUIESCENT, "0").equals("1");
+            sQuiescent = mSystemProperties.get(SYSTEM_PROPERTY_QUIESCENT, "0").equals("1")
+                    || InitProperties.userspace_reboot_in_progress().orElse(false);
 
             mNativeWrapper.nativeInit(this);
             mNativeWrapper.nativeSetAutoSuspend(false);