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

Browse Source
This commit is contained in:
Nikita Ioffe
2020-03-19 16:42:19 +00:00
committed by Android (Google) Code Review
parent a7aededa7d 22216c6926
commit 82d21c4b89
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.dreams.DreamManagerInternal;
import android.service.vr.IVrManager; import android.service.vr.IVrManager;
import android.service.vr.IVrStateCallbacks; import android.service.vr.IVrStateCallbacks;
import android.sysprop.InitProperties;
import android.util.KeyValueListParser; import android.util.KeyValueListParser;
import android.util.PrintWriterPrinter; import android.util.PrintWriterPrinter;
import android.util.Slog; import android.util.Slog;
@@ -968,7 +969,8 @@ public final class PowerManagerService extends SystemService
mHalInteractiveModeEnabled = true; mHalInteractiveModeEnabled = true;
mWakefulnessRaw = WAKEFULNESS_AWAKE; 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.nativeInit(this);
mNativeWrapper.nativeSetAutoSuspend(false); mNativeWrapper.nativeSetAutoSuspend(false);