Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I425b8f173c65516321f5e38e9e970976892804b2
This commit is contained in:
TreeHugger Robot
2021-06-18 14:14:06 +00:00
committed by Automerger Merge Worker
parent c35d1ad6f7 fb5a9a52aa
commit 3752527441
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/keyguard/WakefulnessLifecycle.java
View File

@@ -67,7 +67,7 @@ public class WakefulnessLifecycle extends Lifecycle<WakefulnessLifecycle.Observe
@Nullable @Nullable
private final IWallpaperManager mWallpaperManagerService; private final IWallpaperManager mWallpaperManagerService;
private int mWakefulness = WAKEFULNESS_ASLEEP; private int mWakefulness = WAKEFULNESS_AWAKE;
private @PowerManager.WakeReason int mLastWakeReason = PowerManager.WAKE_REASON_UNKNOWN; private @PowerManager.WakeReason int mLastWakeReason = PowerManager.WAKE_REASON_UNKNOWN;

2
packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java
View File

@@ -135,7 +135,7 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa
private boolean mShowVolumeDialog; private boolean mShowVolumeDialog;
private boolean mShowSafetyWarning; private boolean mShowSafetyWarning;
private long mLastToggledRingerOn; private long mLastToggledRingerOn;
private boolean mDeviceInteractive; private boolean mDeviceInteractive = true;
private boolean mDestroyed; private boolean mDestroyed;
private VolumePolicy mVolumePolicy; private VolumePolicy mVolumePolicy;

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

@@ -56,7 +56,7 @@ public class WakefulnessLifecycleTest extends SysuiTestCase {
@Test @Test
public void baseState() throws Exception { public void baseState() throws Exception {
assertEquals(WakefulnessLifecycle.WAKEFULNESS_ASLEEP, mWakefulness.getWakefulness()); assertEquals(WakefulnessLifecycle.WAKEFULNESS_AWAKE, mWakefulness.getWakefulness());
verifyNoMoreInteractions(mWakefulnessObserver); verifyNoMoreInteractions(mWakefulnessObserver);
} }