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

Commit 9e69e359 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 

Change-Id: I8a3ff4f391502933733a1db86157a647f534fd3b
parents 5fdb8a3b 82d21c4b

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

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