Merge "Don't show biometric prompt if owner is not in foreground" into udc-qpr-dev

packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java

@@ -201,7 +201,9 @@ public class AuthController implements CoreStartable, CommandQueue.Callbacks,
     final TaskStackListener mTaskStackListener = new TaskStackListener() {
         @Override
         public void onTaskStackChanged() {
-            mHandler.post(AuthController.this::cancelIfOwnerIsNotInForeground);
+            if (!isOwnerInForeground()) {
+                mHandler.post(AuthController.this::cancelIfOwnerIsNotInForeground);
+            }
         }
     };
 
@@ -239,33 +241,37 @@ public class AuthController implements CoreStartable, CommandQueue.Callbacks,
         }
     }
 
+    private boolean isOwnerInForeground() {
+        final String clientPackage = mCurrentDialog.getOpPackageName();
+        final List<ActivityManager.RunningTaskInfo> runningTasks =
+                mActivityTaskManager.getTasks(1);
+        if (!runningTasks.isEmpty()) {
+            final String topPackage = runningTasks.get(0).topActivity.getPackageName();
+            if (!topPackage.contentEquals(clientPackage)
+                    && !Utils.isSystem(mContext, clientPackage)) {
+                Log.w(TAG, "Evicting client due to: " + topPackage);
+                return false;
+            }
+        }
+        return true;
+    }
+
     private void cancelIfOwnerIsNotInForeground() {
         mExecution.assertIsMainThread();
         if (mCurrentDialog != null) {
             try {
-                final String clientPackage = mCurrentDialog.getOpPackageName();
+                mCurrentDialog.dismissWithoutCallback(true /* animate */);
-                Log.w(TAG, "Task stack changed, current client: " + clientPackage);
+                mCurrentDialog = null;
-                final List<ActivityManager.RunningTaskInfo> runningTasks =
-                        mActivityTaskManager.getTasks(1);
-                if (!runningTasks.isEmpty()) {
-                    final String topPackage = runningTasks.get(0).topActivity.getPackageName();
-                    if (!topPackage.contentEquals(clientPackage)
-                            && !Utils.isSystem(mContext, clientPackage)) {
-                        Log.e(TAG, "Evicting client due to: " + topPackage);
-                        mCurrentDialog.dismissWithoutCallback(true /* animate */);
-                        mCurrentDialog = null;
 
-                        for (Callback cb : mCallbacks) {
+                for (Callback cb : mCallbacks) {
-                            cb.onBiometricPromptDismissed();
+                    cb.onBiometricPromptDismissed();
-                        }
+                }
 
-                        if (mReceiver != null) {
+                if (mReceiver != null) {
-                            mReceiver.onDialogDismissed(
+                    mReceiver.onDialogDismissed(
-                                    BiometricPrompt.DISMISSED_REASON_USER_CANCEL,
+                            BiometricPrompt.DISMISSED_REASON_USER_CANCEL,
-                                    null /* credentialAttestation */);
+                            null /* credentialAttestation */);
-                            mReceiver = null;
+                    mReceiver = null;
-                        }
-                    }
                 }
             } catch (RemoteException e) {
                 Log.e(TAG, "Remote exception", e);
@@ -1253,10 +1259,11 @@ public class AuthController implements CoreStartable, CommandQueue.Callbacks,
             cb.onBiometricPromptShown();
         }
         mCurrentDialog = newDialog;
-        mCurrentDialog.show(mWindowManager, savedState);
 
-        if (!promptInfo.isAllowBackgroundAuthentication()) {
+        if (!promptInfo.isAllowBackgroundAuthentication() && !isOwnerInForeground()) {
-            mHandler.post(this::cancelIfOwnerIsNotInForeground);
+            cancelIfOwnerIsNotInForeground();
+        } else {
+            mCurrentDialog.show(mWindowManager, savedState);
         }
     }
 

packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthControllerTest.java

@@ -954,6 +954,25 @@ public class AuthControllerTest extends SysuiTestCase {
                 eq(null) /* credentialAttestation */);
     }
 
+    @Test
+    public void testShowDialog_whenOwnerNotInForeground() {
+        PromptInfo promptInfo = createTestPromptInfo();
+        promptInfo.setAllowBackgroundAuthentication(false);
+        switchTask("other_package");
+        mAuthController.showAuthenticationDialog(promptInfo,
+                mReceiver /* receiver */,
+                new int[]{1} /* sensorIds */,
+                false /* credentialAllowed */,
+                true /* requireConfirmation */,
+                0 /* userId */,
+                0 /* operationId */,
+                "testPackage",
+                REQUEST_ID);
+
+        assertNull(mAuthController.mCurrentDialog);
+        verify(mDialog1, never()).show(any(), any());
+    }
+
     private void showDialog(int[] sensorIds, boolean credentialAllowed) {
         mAuthController.showAuthenticationDialog(createTestPromptInfo(),
                 mReceiver /* receiver */,