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

Don't re-lock if we're wake and unlocking.

Browse Source 
This can make the wallpaper visible through the scrim
if you wake and unlock during the screen off animation.

Fixes: 261440698
Test: wake and unlock during screen off repeatedly
Change-Id: I6d48dc2211e16b88168e03a56f338222b582b97b
This commit is contained in:
Josh Tsuji
2022-12-06 15:56:52 -05:00
parent 1c79c55c4e
commit 4bb7522ab0
2 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1613,7 +1613,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
// TODO: Rename all screen off/on references to interactive/sleeping
synchronized (this) {
mDeviceInteractive = true;
if (mPendingLock && !cameraGestureTriggered) {
if (mPendingLock && !cameraGestureTriggered && !mWakeAndUnlocking) {
doKeyguardLocked(null);
}
mAnimatingScreenOff = false;

39
packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java
View File

@@ -141,6 +141,45 @@ public class KeyguardViewMediatorTest extends SysuiTestCase {
verify(mStatusBarKeyguardViewManager, never()).setKeyguardGoingAwayState(anyBoolean());
}
@Test
@TestableLooper.RunWithLooper(setAsMainLooper = true)
public void testOnStartedWakingUp_whileSleeping_ifWakeAndUnlocking_doesNotShowKeyguard() {
when(mLockPatternUtils.isLockScreenDisabled(anyInt())).thenReturn(false);
when(mLockPatternUtils.getPowerButtonInstantlyLocks(anyInt())).thenReturn(true);
mViewMediator.onSystemReady();
TestableLooper.get(this).processAllMessages();
mViewMediator.setShowingLocked(false);
TestableLooper.get(this).processAllMessages();
mViewMediator.onStartedGoingToSleep(OFF_BECAUSE_OF_USER);
mViewMediator.onWakeAndUnlocking();
mViewMediator.onStartedWakingUp(OFF_BECAUSE_OF_USER, false);
TestableLooper.get(this).processAllMessages();
assertFalse(mViewMediator.isShowingAndNotOccluded());
verify(mKeyguardStateController, never()).notifyKeyguardState(eq(true), anyBoolean());
}
@Test
@TestableLooper.RunWithLooper(setAsMainLooper = true)
public void testOnStartedWakingUp_whileSleeping_ifNotWakeAndUnlocking_showsKeyguard() {
when(mLockPatternUtils.isLockScreenDisabled(anyInt())).thenReturn(false);
when(mLockPatternUtils.getPowerButtonInstantlyLocks(anyInt())).thenReturn(true);
mViewMediator.onSystemReady();
TestableLooper.get(this).processAllMessages();
mViewMediator.setShowingLocked(false);
TestableLooper.get(this).processAllMessages();
mViewMediator.onStartedGoingToSleep(OFF_BECAUSE_OF_USER);
mViewMediator.onStartedWakingUp(OFF_BECAUSE_OF_USER, false);
TestableLooper.get(this).processAllMessages();
assertTrue(mViewMediator.isShowingAndNotOccluded());
}
@Test
public void testRegisterDumpable() {
verify(mDumpManager).registerDumpable(KeyguardViewMediator.class.getName(), mViewMediator);