Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa1d50ab authored by Nikita Ioffe's avatar Nikita Ioffe Committed by Automerger Merge Worker
Browse files

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

Change-Id: Ida386e9f798c833235801a3added2457986155c3
parents 43cd1006 9e69e359

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

+3 −1
Original line number Diff line number Diff line
@@ -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);