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

Commit 22216c69 authored by Nikita Ioffe's avatar Nikita Ioffe
Browse files

RFC: don't turn screen on after userspace reboot

Bug: 151606291
Test: adb shell svc power reboot userpace
Change-Id: Iaa5b9f6fcc3a4f41266d508442c775959d4a570e
parent 5bb02f08
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -42,8 +42,6 @@ import android.hardware.SystemSensorManager;
import android.hardware.display.AmbientDisplayConfiguration;
import android.hardware.display.DisplayManagerInternal;
import android.hardware.display.DisplayManagerInternal.DisplayPowerRequest;
import android.hardware.power.Boost;
import android.hardware.power.Mode;
import android.hardware.power.V1_0.PowerHint;
import android.net.Uri;
import android.os.BatteryManager;
@@ -77,6 +75,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 +967,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);