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

Fix biometric prompt disappeared by itself after rotate 180 degrees

Browse Source 
"onConfigurationChanged" won't be triggered when device rotate from
landscape to landscape or portrait to portrait. We need to skip
onWindowFocusChanged(false) in above cases to avoid BP closed.

Bug: b/246683265
Test: 1. Show BP in landscape
      2. Rotate device with 180 degree
      3. atest AuthContainerViewTest#testFocusLossAfterRotating
Change-Id: I398e52e5cb749d64a3953b6718df08c36498a02d
This commit is contained in:
Vincent Wang
2022-11-02 06:41:07 +00:00
parent d35150f907
commit 852f87ee87
2 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -132,8 +132,7 @@ public class AuthContainerView extends LinearLayout
private final OnBackInvokedCallback mBackCallback = this::onBackInvoked;
private final @Background DelayableExecutor mBackgroundExecutor;
private int mOrientation;
private boolean mSkipFirstLostFocus = false;
private boolean mIsOrientationChanged = false;
// Non-null only if the dialog is in the act of dismissing and has not sent the reason yet.
@Nullable @AuthDialogCallback.DismissedReason private Integer mPendingCallbackReason;
@@ -444,6 +443,7 @@ public class AuthContainerView extends LinearLayout
@Override
public void onOrientationChanged() {
maybeUpdatePositionForUdfps(true /* invalidate */);
mIsOrientationChanged = true;
}
@Override
@@ -452,8 +452,8 @@ public class AuthContainerView extends LinearLayout
if (!hasWindowFocus) {
//it's a workaround to avoid closing BP incorrectly
//BP gets a onWindowFocusChanged(false) and then gets a onWindowFocusChanged(true)
if (mSkipFirstLostFocus) {
mSkipFirstLostFocus = false;
if (mIsOrientationChanged) {
mIsOrientationChanged = false;
return;
}
Log.v(TAG, "Lost window focus, dismissing the dialog");
@@ -465,9 +465,6 @@ public class AuthContainerView extends LinearLayout
public void onAttachedToWindow() {
super.onAttachedToWindow();
//save the first orientation
mOrientation = getResources().getConfiguration().orientation;
mWakefulnessLifecycle.addObserver(this);
if (Utils.isBiometricAllowed(mConfig.mPromptInfo)) {
@@ -623,7 +620,7 @@ public class AuthContainerView extends LinearLayout
}
if (savedState != null) {
mSkipFirstLostFocus = savedState.getBoolean(
mIsOrientationChanged = savedState.getBoolean(
AuthDialog.KEY_BIOMETRIC_ORIENTATION_CHANGED);
}
@@ -717,9 +714,7 @@ public class AuthContainerView extends LinearLayout
mBiometricView != null && mCredentialView == null);
outState.putBoolean(AuthDialog.KEY_CREDENTIAL_SHOWING, mCredentialView != null);
if (mOrientation != getResources().getConfiguration().orientation) {
outState.putBoolean(AuthDialog.KEY_BIOMETRIC_ORIENTATION_CHANGED, true);
}
outState.putBoolean(AuthDialog.KEY_BIOMETRIC_ORIENTATION_CHANGED, mIsOrientationChanged);
if (mBiometricView != null) {
mBiometricView.onSaveState(outState);

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

@@ -160,6 +160,25 @@ class AuthContainerViewTest : SysuiTestCase() {
assertThat(container.parent).isNull()
}
@Test
fun testFocusLossAfterRotating() {
val container = initializeFingerprintContainer()
waitForIdleSync()
val requestID = authContainer?.requestId ?: 0L
verify(callback).onDialogAnimatedIn(requestID)
container.onOrientationChanged()
container.onWindowFocusChanged(false)
waitForIdleSync()
verify(callback, never()).onDismissed(
eq(AuthDialogCallback.DISMISSED_USER_CANCELED),
eq<ByteArray?>(null), /* credentialAttestation */
eq(requestID)
)
}
@Test
fun testDismissesOnFocusLoss_hidesKeyboardWhenVisible() {
val container = initializeFingerprintContainer(