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

Merge "Revert "Stop face auth when bouncerWillBeShown instead of bouncerFullyShown"" into tm-qpr-dev

Browse Source
This commit is contained in:
Chandru S
2022-09-23 23:35:33 +00:00
committed by Android (Google) Code Review
parent dbf6151114 8477876bfc
commit 59178368ee
4 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/src/com/android/keyguard/KeyguardListenModel.kt
View File

@@ -52,7 +52,6 @@ data class KeyguardFaceListenModel(
val becauseCannotSkipBouncer: Boolean, val becauseCannotSkipBouncer: Boolean,
val biometricSettingEnabledForUser: Boolean, val biometricSettingEnabledForUser: Boolean,
val bouncerFullyShown: Boolean, val bouncerFullyShown: Boolean,
val bouncerIsOrWillShow: Boolean,
val faceAuthenticated: Boolean, val faceAuthenticated: Boolean,
val faceDisabled: Boolean, val faceDisabled: Boolean,
val faceLockedOut: Boolean, val faceLockedOut: Boolean,

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

@@ -2597,7 +2597,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
// on bouncer if both fp and fingerprint are enrolled. // on bouncer if both fp and fingerprint are enrolled.
final boolean awakeKeyguardExcludingBouncerShowing = mKeyguardIsVisible final boolean awakeKeyguardExcludingBouncerShowing = mKeyguardIsVisible
&& mDeviceInteractive && !mGoingToSleep && mDeviceInteractive && !mGoingToSleep
&& !statusBarShadeLocked && !mBouncerIsOrWillBeShowing; && !statusBarShadeLocked && !mBouncerFullyShown;
final int user = getCurrentUser(); final int user = getCurrentUser();
final int strongAuth = mStrongAuthTracker.getStrongAuthForUser(user); final int strongAuth = mStrongAuthTracker.getStrongAuthForUser(user);
final boolean isLockDown = final boolean isLockDown =
@@ -2667,7 +2667,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
becauseCannotSkipBouncer, becauseCannotSkipBouncer,
biometricEnabledForUser, biometricEnabledForUser,
mBouncerFullyShown, mBouncerFullyShown,
mBouncerIsOrWillBeShowing,
faceAuthenticated, faceAuthenticated,
faceDisabledForUser, faceDisabledForUser,
isFaceLockedOut(), isFaceLockedOut(),
@@ -3243,8 +3242,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
cb.onKeyguardBouncerStateChanged(mBouncerIsOrWillBeShowing); cb.onKeyguardBouncerStateChanged(mBouncerIsOrWillBeShowing);
} }
} }
updateBiometricListeningState(BIOMETRIC_ACTION_UPDATE, updateFingerprintListeningState(BIOMETRIC_ACTION_UPDATE);
FaceAuthUiEvent.FACE_AUTH_UPDATED_PRIMARY_BOUNCER_SHOWN_OR_WILL_BE_SHOWN);
} }
if (wasBouncerFullyShown != mBouncerFullyShown) { if (wasBouncerFullyShown != mBouncerFullyShown) {

1
packages/SystemUI/tests/src/com/android/keyguard/KeyguardListenQueueTest.kt
View File

@@ -86,7 +86,6 @@ private fun faceModel(user: Int) = KeyguardFaceListenModel(
becauseCannotSkipBouncer = false, becauseCannotSkipBouncer = false,
biometricSettingEnabledForUser = false, biometricSettingEnabledForUser = false,
bouncerFullyShown = false, bouncerFullyShown = false,
bouncerIsOrWillShow = false,
onlyFaceEnrolled = false, onlyFaceEnrolled = false,
faceAuthenticated = false, faceAuthenticated = false,
faceDisabled = false, faceDisabled = false,

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

@@ -1554,7 +1554,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase {
anyBoolean()); anyBoolean());
CancellationSignal cancelSignal = mCancellationSignalCaptor.getValue(); CancellationSignal cancelSignal = mCancellationSignalCaptor.getValue();
bouncerWillBeVisibleSoon(); bouncerFullyVisible();
mTestableLooper.processAllMessages(); mTestableLooper.processAllMessages();
assertThat(cancelSignal.isCanceled()).isTrue(); assertThat(cancelSignal.isCanceled()).isTrue();
@@ -1752,11 +1752,6 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase {
setKeyguardBouncerVisibility(true); setKeyguardBouncerVisibility(true);
} }
private void bouncerWillBeVisibleSoon() {
mKeyguardUpdateMonitor.sendKeyguardBouncerChanged(true, false);
mTestableLooper.processAllMessages();
}
private void setKeyguardBouncerVisibility(boolean isVisible) { private void setKeyguardBouncerVisibility(boolean isVisible) {
mKeyguardUpdateMonitor.sendKeyguardBouncerChanged(isVisible, isVisible); mKeyguardUpdateMonitor.sendKeyguardBouncerChanged(isVisible, isVisible);
mTestableLooper.processAllMessages(); mTestableLooper.processAllMessages();