Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1c25c18 authored by Hao Dong's avatar Hao Dong
Browse files

Fix settings activity showing background bp when 

createConfirmDeviceCredentialIntent() API is used.

If the app uses createConfirmDeviceCredentialIntent(),
ConfirmDeviceCredentialActivity is the top activity which has "settings"
as package name. Then if the app switches to settings, since previous
foreground check only checks package name, biometric prompt isn't
cancelled. This CL adds a class name check for this case.

Flag: EXEMPT bugfix
Bug: 339532378
Test: manual test with sample app on emulator
Test: atest BiometricActivityTests#testConfirmDeviceCredentialActivityDismiss_whenSwitchToSettings
Change-Id: I722e285cd15869799b9fadd2324014cf3c6d44ad
Merged-In: I722e285cd15869799b9fadd2324014cf3c6d44ad
Merged-In: I26d8f4713573ab18ef3f83813aaef52ede910b8d
parent 8a7a8c8a

core/java/android/hardware/biometrics/BiometricPrompt.java

+14 −0
Original line number Diff line number Diff line
@@ -432,6 +432,20 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan 
            return this;

        }



        /**

         * Set the class name of ConfirmDeviceCredentialActivity.

         *

         * @return This builder.

         * @hide

         */

        @NonNull

        @RequiresPermission(anyOf = {TEST_BIOMETRIC, USE_BIOMETRIC_INTERNAL})

        public Builder setClassNameIfItIsConfirmDeviceCredentialActivity() {

            mPromptInfo.setClassNameIfItIsConfirmDeviceCredentialActivity(

                    mContext.getClass().getName());

            return this;

        }



        /**

         * Creates a {@link BiometricPrompt}.

         *

core/java/android/hardware/biometrics/PromptInfo.java

+20 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ public class PromptInfo implements Parcelable { 
    private boolean mAllowBackgroundAuthentication;

    private boolean mIgnoreEnrollmentState;

    private boolean mIsForLegacyFingerprintManager = false;

    private String mClassNameIfItIsConfirmDeviceCredentialActivity = null;



    public PromptInfo() {
@@ -70,6 +71,7 @@ public class PromptInfo implements Parcelable { 
        mAllowBackgroundAuthentication = in.readBoolean();

        mIgnoreEnrollmentState = in.readBoolean();

        mIsForLegacyFingerprintManager = in.readBoolean();

        mClassNameIfItIsConfirmDeviceCredentialActivity = in.readString();

    }



    public static final Creator<PromptInfo> CREATOR = new Creator<PromptInfo>() {
@@ -108,6 +110,7 @@ public class PromptInfo implements Parcelable { 
        dest.writeBoolean(mAllowBackgroundAuthentication);

        dest.writeBoolean(mIgnoreEnrollmentState);

        dest.writeBoolean(mIsForLegacyFingerprintManager);

        dest.writeString(mClassNameIfItIsConfirmDeviceCredentialActivity);

    }



    public boolean containsTestConfigurations() {
@@ -119,6 +122,8 @@ public class PromptInfo implements Parcelable { 
            return true;

        } else if (mAllowBackgroundAuthentication) {

            return true;

        } else if (mClassNameIfItIsConfirmDeviceCredentialActivity != null) {

            return true;

        }

        return false;

    }
@@ -213,6 +218,13 @@ public class PromptInfo implements Parcelable { 
        mAllowedSensorIds.add(sensorId);

    }



    /**

     * Set the class name of ConfirmDeviceCredentialActivity.

     */

    void setClassNameIfItIsConfirmDeviceCredentialActivity(String className) {

        mClassNameIfItIsConfirmDeviceCredentialActivity = className;

    }



    // Getters



    public CharSequence getTitle() {
@@ -290,4 +302,12 @@ public class PromptInfo implements Parcelable { 
    public boolean isForLegacyFingerprintManager() {

        return mIsForLegacyFingerprintManager;

    }



    /**

     * Get the class name of ConfirmDeviceCredentialActivity. Returns null if the direct caller is

     * not ConfirmDeviceCredentialActivity.

     */

    public String getClassNameIfItIsConfirmDeviceCredentialActivity() {

        return mClassNameIfItIsConfirmDeviceCredentialActivity;

    }

}

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

+5 −0
Original line number Diff line number Diff line
@@ -688,6 +688,11 @@ public class AuthContainerView extends LinearLayout 
        return mConfig.mOpPackageName;

    }



    @Override

    public String getClassNameIfItIsConfirmDeviceCredentialActivity() {

        return  mConfig.mPromptInfo.getClassNameIfItIsConfirmDeviceCredentialActivity();

    }



    @Override

    public void animateToCredentialUI() {

        mBiometricView.startTransitionToCredentialUI();

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

+52 −19
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.app.ActivityManager; 
import android.app.ActivityTaskManager;

import android.app.TaskStackListener;

import android.content.BroadcastReceiver;

import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;
@@ -206,15 +207,9 @@ public class AuthController extends SystemUI implements CommandQueue.Callbacks, 
    private void cancelIfOwnerIsNotInForeground() {

        if (mCurrentDialog != null) {

            try {

                final String clientPackage = mCurrentDialog.getOpPackageName();

                Log.w(TAG, "Task stack changed, current client: " + clientPackage);

                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);

                if (isOwnerInBackground()) {

                    Log.w(TAG, "Evicting client due to top activity is not : "

                            + mCurrentDialog.getOpPackageName());

                    mCurrentDialog.dismissWithoutCallback(true /* animate */);

                    mCurrentDialog = null;

                    mOrientationListener.disable();
@@ -226,13 +221,51 @@ public class AuthController extends SystemUI implements CommandQueue.Callbacks, 
                        mReceiver = null;

                    }

                }

                }

            } catch (RemoteException e) {

                Log.e(TAG, "Remote exception", e);

            }

        }

    }



    private boolean isOwnerInBackground() {

        if (mCurrentDialog != null) {

            final String clientPackage = mCurrentDialog.getOpPackageName();



            final List<ActivityManager.RunningTaskInfo> runningTasks =

                    mActivityTaskManager.getTasks(1);

            if (runningTasks == null || runningTasks.isEmpty()) {

                Log.w(TAG, "No running tasks reported");

                return false;

            }



            final boolean isSystemApp = Utils.isSystem(mContext, clientPackage);



            final ComponentName topActivity = runningTasks.get(0).topActivity;

            final String topPackage =  topActivity.getPackageName();

            final boolean topPackageEqualsToClient =

                    topPackage == null

                            || topActivity.getPackageName().contentEquals(clientPackage);



            // b/339532378: If it's ConfirmDeviceCredentialActivity, we need to check further on

            // class name.

            final String clientClassNameForCDCA =

                    mCurrentDialog.getClassNameIfItIsConfirmDeviceCredentialActivity();

            final boolean isClientCDCA = clientClassNameForCDCA != null;

            final String topClassName = topActivity.getClassName();

            final boolean isCDCAWithWrongTopClass =

                    isClientCDCA

                            && !(topClassName == null

                                    || topClassName.contentEquals(clientClassNameForCDCA));



            final boolean isInBackground =

                    !(isSystemApp || topPackageEqualsToClient) || isCDCAWithWrongTopClass;



            Log.w(TAG, "isInBackground " + isInBackground);

            return isInBackground;

        }

        return false;

    }



    /**

     * Adds a callback. See {@link Callback}.

     */

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

+6 −0
Original line number Diff line number Diff line
@@ -147,6 +147,12 @@ public interface AuthDialog { 
     */

    String getOpPackageName();



    /**

     * Get the class name of ConfirmDeviceCredentialActivity. Returns null if the direct caller is

     * not ConfirmDeviceCredentialActivity.

     */

    String getClassNameIfItIsConfirmDeviceCredentialActivity();



    /**

     * Animate to credential UI. Typically called after biometric is locked out.

     */