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

Merge "Run error callback when BiometricPrompt dismissed early" into rvc-qpr-dev

Browse Source
This commit is contained in:
Curtis Belmonte
2020-11-18 01:06:41 +00:00
committed by Android (Google) Code Review
parent 7205d79832 246553d1fb
commit 22ac0c0bd9
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java
View File

@@ -96,7 +96,7 @@ public class AuthContainerView extends LinearLayout
@VisibleForTesting final WakefulnessLifecycle mWakefulnessLifecycle; @VisibleForTesting final WakefulnessLifecycle mWakefulnessLifecycle;
private @ContainerState int mContainerState = STATE_UNKNOWN; @VisibleForTesting @ContainerState int mContainerState = STATE_UNKNOWN;
// Non-null only if the dialog is in the act of dismissing and has not sent the reason yet. // Non-null only if the dialog is in the act of dismissing and has not sent the reason yet.
@Nullable @AuthDialogCallback.DismissedReason Integer mPendingCallbackReason; @Nullable @AuthDialogCallback.DismissedReason Integer mPendingCallbackReason;
@@ -607,10 +607,11 @@ public class AuthContainerView extends LinearLayout
mWindowManager.removeView(this); mWindowManager.removeView(this);
} }
private void onDialogAnimatedIn() { @VisibleForTesting
void onDialogAnimatedIn() {
if (mContainerState == STATE_PENDING_DISMISS) { if (mContainerState == STATE_PENDING_DISMISS) {
Log.d(TAG, "onDialogAnimatedIn(): mPendingDismissDialog=true, dismissing now"); Log.d(TAG, "onDialogAnimatedIn(): mPendingDismissDialog=true, dismissing now");
animateAway(false /* sendReason */, 0); animateAway(AuthDialogCallback.DISMISSED_USER_CANCELED);
return; return;
} }
mContainerState = STATE_SHOWING; mContainerState = STATE_SHOWING;

10
packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthContainerViewTest.java
View File

@@ -203,6 +203,16 @@ public class AuthContainerViewTest extends SysuiTestCase {
eq(View.IMPORTANT_FOR_ACCESSIBILITY_NO)); eq(View.IMPORTANT_FOR_ACCESSIBILITY_NO));
} }
@Test
public void testOnDialogAnimatedIn_sendsCancelReason_whenPendingDismiss() {
initializeContainer(Authenticators.BIOMETRIC_WEAK);
mAuthContainer.mContainerState = AuthContainerView.STATE_PENDING_DISMISS;
mAuthContainer.onDialogAnimatedIn();
verify(mCallback).onDismissed(
eq(AuthDialogCallback.DISMISSED_USER_CANCELED),
eq(null) /* credentialAttestation */);
}
@Test @Test
public void testLayoutParams_hasSecureWindowFlag() { public void testLayoutParams_hasSecureWindowFlag() {
final IBinder windowToken = mock(IBinder.class); final IBinder windowToken = mock(IBinder.class);