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

Commit 83d20cc2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "WakefulenessLifecycle: start out as AWAKE for NFFs" into sc-dev am:... 

Merge "WakefulenessLifecycle: start out as AWAKE for NFFs" into sc-dev am: fb5a9a52 am: a81e0663

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15012790

Change-Id: I6ca132bb2d08bb9ec500989295c1ff6162a41775
parents 4cff586b a81e0663

packages/SystemUI/src/com/android/systemui/keyguard/WakefulnessLifecycle.java

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ public class WakefulnessLifecycle extends Lifecycle<WakefulnessLifecycle.Observe 
    @Nullable

    private final IWallpaperManager mWallpaperManagerService;



    private int mWakefulness = WAKEFULNESS_ASLEEP;

    private int mWakefulness = WAKEFULNESS_AWAKE;



    private @PowerManager.WakeReason int mLastWakeReason = PowerManager.WAKE_REASON_UNKNOWN;

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa 
    private boolean mShowVolumeDialog;

    private boolean mShowSafetyWarning;

    private long mLastToggledRingerOn;

    private boolean mDeviceInteractive;

    private boolean mDeviceInteractive = true;



    private boolean mDestroyed;

    private VolumePolicy mVolumePolicy;

packages/SystemUI/tests/src/com/android/systemui/keyguard/WakefulnessLifecycleTest.java

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ public class WakefulnessLifecycleTest extends SysuiTestCase { 


    @Test

    public void baseState() throws Exception {

        assertEquals(WakefulnessLifecycle.WAKEFULNESS_ASLEEP, mWakefulness.getWakefulness());

        assertEquals(WakefulnessLifecycle.WAKEFULNESS_AWAKE, mWakefulness.getWakefulness());



        verifyNoMoreInteractions(mWakefulnessObserver);

    }