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

Merge "Don't delay bouncer if face + fp enrolled" into tm-d1-dev

Browse Source
This commit is contained in:
Beverly Tai
2022-05-17 17:00:18 +00:00
committed by Android (Google) Code Review
parent 0596a70562 181b2c1706
commit 48bcccefa0
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
View File

@@ -216,9 +216,12 @@ public class KeyguardBouncer {
// Split up the work over multiple frames. // Split up the work over multiple frames.
DejankUtils.removeCallbacks(mResetRunnable); DejankUtils.removeCallbacks(mResetRunnable);
if (mKeyguardStateController.isFaceAuthEnabled() && !needsFullscreenBouncer() if (mKeyguardStateController.isFaceAuthEnabled()
&& !mKeyguardUpdateMonitor.userNeedsStrongAuth() && !mKeyguardUpdateMonitor.getCachedIsUnlockWithFingerprintPossible(
&& !mKeyguardBypassController.getBypassEnabled()) { KeyguardUpdateMonitor.getCurrentUser())
&& !needsFullscreenBouncer()
&& !mKeyguardUpdateMonitor.userNeedsStrongAuth()
&& !mKeyguardBypassController.getBypassEnabled()) {
mHandler.postDelayed(mShowRunnable, BOUNCER_FACE_DELAY); mHandler.postDelayed(mShowRunnable, BOUNCER_FACE_DELAY);
} else { } else {
DejankUtils.postAfterTraversal(mShowRunnable); DejankUtils.postAfterTraversal(mShowRunnable);

13
packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardBouncerTest.java
View File

@@ -399,9 +399,8 @@ public class KeyguardBouncerTest extends SysuiTestCase {
mBouncer.hide(false /* destroyView */); mBouncer.hide(false /* destroyView */);
verify(mHandler).removeCallbacks(eq(showRunnable.getValue())); verify(mHandler).removeCallbacks(eq(showRunnable.getValue()));
} }
@Test @Test
public void testShow_delaysIfFaceAuthIsRunning_unlessBypass() { public void testShow_delaysIfFaceAuthIsRunning_unlessBypassEnabled() {
when(mKeyguardStateController.isFaceAuthEnabled()).thenReturn(true); when(mKeyguardStateController.isFaceAuthEnabled()).thenReturn(true);
when(mKeyguardBypassController.getBypassEnabled()).thenReturn(true); when(mKeyguardBypassController.getBypassEnabled()).thenReturn(true);
mBouncer.show(true /* reset */); mBouncer.show(true /* reset */);
@@ -409,6 +408,16 @@ public class KeyguardBouncerTest extends SysuiTestCase {
verify(mHandler, never()).postDelayed(any(), anyLong()); verify(mHandler, never()).postDelayed(any(), anyLong());
} }
@Test
public void testShow_delaysIfFaceAuthIsRunning_unlessFingerprintEnrolled() {
when(mKeyguardStateController.isFaceAuthEnabled()).thenReturn(true);
when(mKeyguardUpdateMonitor.getCachedIsUnlockWithFingerprintPossible(0))
.thenReturn(true);
mBouncer.show(true /* reset */);
verify(mHandler, never()).postDelayed(any(), anyLong());
}
@Test @Test
public void testRegisterUpdateMonitorCallback() { public void testRegisterUpdateMonitorCallback() {
verify(mKeyguardUpdateMonitor).registerCallback(any()); verify(mKeyguardUpdateMonitor).registerCallback(any());