Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I8a3ff4f391502933733a1db86157a647f534fd3b
This commit is contained in:
Nikita Ioffe
2020-03-19 17:01:28 +00:00
committed by Automerger Merge Worker
parent 5fdb8a3b8f 82d21c4b89
commit 9e69e359c4
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/power/PowerManagerService.java
View File

@@ -77,6 +77,7 @@ import android.provider.Settings.SettingNotFoundException;
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 @@ public final class PowerManagerService extends SystemService
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);