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

Merge "Don't update biometricListenState on SB stateChange" into sc-dev am: bc563d803f

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

Change-Id: Ie766c1100a66879f772f168d4592f9c429a5aada
This commit is contained in:
TreeHugger Robot
2021-05-17 17:13:48 +00:00
committed by Automerger Merge Worker
parent b2ea76cc02 bc563d803f
commit a723f50603
2 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
View File

@@ -252,7 +252,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
@Override @Override
public void onStateChanged(int newState) { public void onStateChanged(int newState) {
mStatusBarState = newState; mStatusBarState = newState;
updateBiometricListeningState();
} }
@Override @Override

28
packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java
View File

@@ -942,6 +942,34 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase {
assertThat(mKeyguardUpdateMonitor.shouldListenForFingerprint(true)).isEqualTo(false); assertThat(mKeyguardUpdateMonitor.shouldListenForFingerprint(true)).isEqualTo(false);
} }
@Test
public void testShouldNotUpdateBiometricListeningStateOnStatusBarStateChange() {
// GIVEN state for face auth should run aside from StatusBarState
when(mDevicePolicyManager.getKeyguardDisabledFeatures(null,
KeyguardUpdateMonitor.getCurrentUser())).thenReturn(0);
mStatusBarStateListener.onStateChanged(StatusBarState.SHADE_LOCKED);
setKeyguardBouncerVisibility(false /* isVisible */);
mKeyguardUpdateMonitor.dispatchStartedWakingUp();
when(mKeyguardBypassController.canBypass()).thenReturn(true);
mKeyguardUpdateMonitor.onKeyguardVisibilityChanged(true);
// WHEN status bar state reports a change to the keyguard that would normally indicate to
// start running face auth
mStatusBarStateListener.onStateChanged(StatusBarState.KEYGUARD);
assertThat(mKeyguardUpdateMonitor.shouldListenForFace()).isEqualTo(true);
// THEN face unlock is not running b/c status bar state changes don't cause biometric
// listening state to update
assertThat(mKeyguardUpdateMonitor.isFaceUnlockRunning(
KeyguardUpdateMonitor.getCurrentUser())).isEqualTo(false);
// WHEN biometric listening state is updated
mKeyguardUpdateMonitor.onKeyguardVisibilityChanged(true);
// THEN face unlock is running
assertThat(mKeyguardUpdateMonitor.isFaceDetectionRunning()).isEqualTo(true);
}
@Test @Test
public void testRequireUnlockForNfc_Broadcast() { public void testRequireUnlockForNfc_Broadcast() {
KeyguardUpdateMonitorCallback callback = mock(KeyguardUpdateMonitorCallback.class); KeyguardUpdateMonitorCallback callback = mock(KeyguardUpdateMonitorCallback.class);