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

Run error callback when BiometricPrompt dismissed early

Browse Source 
Currently, if BiometricPrompt is dismissed quickly (e.g. by tapping on
the top half of the screen to dismiss it while it's being shown) the
ongoing authentication session may not be canceled and the
onAuthenticationError callback may not be run. This commit fixes the
issue by ensuring that a dismissal reason is sent to callback if the
prompt is shown while in the "pending dismissal" state.

Test: atest com.android.systemui.biometrics
Test: Manual:
1. Using a custom test app, trigger BiometricPrompt to be shown
2. While the prompt is being shown, repeatedly tap top half of screen
3. Ensure the prompt is dismissed and onAuthenticationError is called

Bug: 173417042
Change-Id: I99284cb7fc413c0790f50056d553dc311117ce0c
This commit is contained in:
Curtis Belmonte
2020-11-18 12:34:35 -08:00
parent f9f2634d3a
commit a1cf4df73e
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;
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.
@Nullable @AuthDialogCallback.DismissedReason Integer mPendingCallbackReason;
@@ -607,10 +607,11 @@ public class AuthContainerView extends LinearLayout
mWindowManager.removeView(this);
}
private void onDialogAnimatedIn() {
@VisibleForTesting
void onDialogAnimatedIn() {
if (mContainerState == STATE_PENDING_DISMISS) {
Log.d(TAG, "onDialogAnimatedIn(): mPendingDismissDialog=true, dismissing now");
animateAway(false /* sendReason */, 0);
animateAway(AuthDialogCallback.DISMISSED_USER_CANCELED);
return;
}
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));
}
@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
public void testLayoutParams_hasSecureWindowFlag() {
final IBinder windowToken = mock(IBinder.class);