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

Merge "Dismiss BiometricPrompt if window focus is lost" into tm-dev

Browse Source
This commit is contained in:
Bill Lin
2022-06-14 11:01:48 +00:00
committed by Android (Google) Code Review
parent 2685de9862 f112d19ff3
commit bee318e35b
2 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -405,6 +405,15 @@ public class AuthContainerView extends LinearLayout
maybeUpdatePositionForUdfps(true /* invalidate */);
}
@Override
public void onWindowFocusChanged(boolean hasWindowFocus) {
super.onWindowFocusChanged(hasWindowFocus);
if (!hasWindowFocus) {
Log.v(TAG, "Lost window focus, dismissing the dialog");
animateAway(AuthDialogCallback.DISMISSED_USER_CANCELED);
}
}
@Override
public void onAttachedToWindow() {
super.onAttachedToWindow();
@@ -720,7 +729,7 @@ public class AuthContainerView extends LinearLayout
final WindowManager.LayoutParams lp = new WindowManager.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.MATCH_PARENT,
WindowManager.LayoutParams.TYPE_STATUS_BAR_SUB_PANEL,
WindowManager.LayoutParams.TYPE_STATUS_BAR_ADDITIONAL,
windowFlags,
PixelFormat.TRANSLUCENT);
lp.privateFlags |= WindowManager.LayoutParams.SYSTEM_FLAG_SHOW_FOR_ALL_USERS;

17
packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthContainerViewTest.kt
View File

@@ -105,6 +105,23 @@ class AuthContainerViewTest : SysuiTestCase() {
verify(callback).onDialogAnimatedIn()
}
@Test
fun testDismissesOnFocusLoss() {
val container = initializeContainer()
waitForIdleSync()
verify(callback).onDialogAnimatedIn()
container.onWindowFocusChanged(false)
waitForIdleSync()
verify(callback).onDismissed(
eq(AuthDialogCallback.DISMISSED_USER_CANCELED),
eq<ByteArray?>(null) /* credentialAttestation */
)
assertThat(container.parent).isNull()
}
@Test
fun testActionAuthenticated_sendsDismissedAuthenticated() {
val container = initializeContainer()