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

Revert "Do not finish lockscreen for multiple sims."

Browse Source 
This reverts commit 0f0a5bd651.

Reason for revert: automerge conflicts

Change-Id: I5b696f3cc7d364458630ba3510961caee6ef66d8
This commit is contained in:
Aaron Liu
2023-08-11 17:39:17 +00:00
committed by Android (Google) Code Review
parent 0f0a5bd651
commit a16f085413
2 changed files with 1 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java
View File

@@ -826,8 +826,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard
SecurityMode securityMode = mSecurityModel.getSecurityMode(targetUserId);
boolean isLockscreenDisabled = mLockPatternUtils.isLockScreenDisabled(
KeyguardUpdateMonitor.getCurrentUser());
if (securityMode == SecurityMode.None) {
if (securityMode == SecurityMode.None || isLockscreenDisabled) {
finish = isLockscreenDisabled;
eventSubtype = BOUNCER_DISMISS_SIM;
uiEvent = BouncerUiEvent.BOUNCER_DISMISS_SIM;

24
packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.kt
View File

@@ -483,30 +483,6 @@ class KeyguardSecurityContainerControllerTest : SysuiTestCase() {
verify(viewMediatorCallback, never()).keyguardDone(anyBoolean(), anyInt())
}
@Test
fun showNextSecurityScreenOrFinish_SimPinToAnotherSimPin_None() {
// GIVEN the current security method is SimPin
whenever(keyguardUpdateMonitor.getUserHasTrust(anyInt())).thenReturn(false)
whenever(keyguardUpdateMonitor.getUserUnlockedWithBiometric(TARGET_USER_ID))
.thenReturn(false)
underTest.showSecurityScreen(SecurityMode.SimPin)
// WHEN a request is made from the SimPin screens to show the next security method
whenever(keyguardSecurityModel.getSecurityMode(TARGET_USER_ID))
.thenReturn(SecurityMode.SimPin)
whenever(lockPatternUtils.isLockScreenDisabled(anyInt())).thenReturn(true)
underTest.showNextSecurityScreenOrFinish(
/* authenticated= */ true,
TARGET_USER_ID,
/* bypassSecondaryLockScreen= */ true,
SecurityMode.SimPin
)
// THEN the next security method of None will dismiss keyguard.
verify(viewMediatorCallback, never()).keyguardDone(anyBoolean(), anyInt())
}
@Test
fun onSwipeUp_whenFaceDetectionIsNotRunning_initiatesFaceAuth() {
val registeredSwipeListener = registeredSwipeListener