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

Commit ddb52152 authored by Diya Bera's avatar Diya Bera Committed by Automerger Merge Worker
Browse files

Merge "Require permission for hidden APIs in BiometricPrompt" into udc-qpr-dev... 

Merge "Require permission for hidden APIs in BiometricPrompt" into udc-qpr-dev am: cb4d1fb6 am: d5f8eb57

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24056525



Change-Id: Iecb04dcd288f9b0a408e4c42268229f96536c7d0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 52746bbc d5f8eb57

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

+6 −0
Original line number Original line Diff line number Diff line
@@ -144,6 +144,7 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan 
        private Context mContext;

        private Context mContext;

        private IAuthService mService;

        private IAuthService mService;





        // LINT.IfChange

        /**

        /**

         * Creates a builder for a {@link BiometricPrompt} dialog.

         * Creates a builder for a {@link BiometricPrompt} dialog.

         * @param context The {@link Context} that will be used to build the prompt.

         * @param context The {@link Context} that will be used to build the prompt.
@@ -417,6 +418,7 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan 
         * @hide

         * @hide

         */

         */

        @NonNull

        @NonNull

        @RequiresPermission(anyOf = {USE_BIOMETRIC_INTERNAL})

        public Builder setDisallowBiometricsIfPolicyExists(boolean checkDevicePolicyManager) {

        public Builder setDisallowBiometricsIfPolicyExists(boolean checkDevicePolicyManager) {

            mPromptInfo.setDisallowBiometricsIfPolicyExists(checkDevicePolicyManager);

            mPromptInfo.setDisallowBiometricsIfPolicyExists(checkDevicePolicyManager);

            return this;

            return this;
@@ -429,6 +431,7 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan 
         * @hide

         * @hide

         */

         */

        @NonNull

        @NonNull

        @RequiresPermission(anyOf = {USE_BIOMETRIC_INTERNAL})

        public Builder setReceiveSystemEvents(boolean set) {

        public Builder setReceiveSystemEvents(boolean set) {

            mPromptInfo.setReceiveSystemEvents(set);

            mPromptInfo.setReceiveSystemEvents(set);

            return this;

            return this;
@@ -442,6 +445,7 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan 
         * @hide

         * @hide

         */

         */

        @NonNull

        @NonNull

        @RequiresPermission(anyOf = {TEST_BIOMETRIC, USE_BIOMETRIC_INTERNAL})

        public Builder setIgnoreEnrollmentState(boolean ignoreEnrollmentState) {

        public Builder setIgnoreEnrollmentState(boolean ignoreEnrollmentState) {

            mPromptInfo.setIgnoreEnrollmentState(ignoreEnrollmentState);

            mPromptInfo.setIgnoreEnrollmentState(ignoreEnrollmentState);

            return this;

            return this;
@@ -454,10 +458,12 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan 
         * @hide

         * @hide

         */

         */

        @NonNull

        @NonNull

        @RequiresPermission(anyOf = {TEST_BIOMETRIC, USE_BIOMETRIC_INTERNAL})

        public Builder setIsForLegacyFingerprintManager(int sensorId) {

        public Builder setIsForLegacyFingerprintManager(int sensorId) {

            mPromptInfo.setIsForLegacyFingerprintManager(sensorId);

            mPromptInfo.setIsForLegacyFingerprintManager(sensorId);

            return this;

            return this;

        }

        }

        // LINT.ThenChange(frameworks/base/core/java/android/hardware/biometrics/PromptInfo.java)





        /**

        /**

         * Creates a {@link BiometricPrompt}.

         * Creates a {@link BiometricPrompt}.

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

+6 −0
Original line number Original line Diff line number Diff line
@@ -113,6 +113,7 @@ public class PromptInfo implements Parcelable { 
        dest.writeBoolean(mIsForLegacyFingerprintManager);

        dest.writeBoolean(mIsForLegacyFingerprintManager);

    }

    }





    // LINT.IfChange

    public boolean containsTestConfigurations() {

    public boolean containsTestConfigurations() {

        if (mIsForLegacyFingerprintManager

        if (mIsForLegacyFingerprintManager

                && mAllowedSensorIds.size() == 1

                && mAllowedSensorIds.size() == 1
@@ -122,6 +123,10 @@ public class PromptInfo implements Parcelable { 
            return true;

            return true;

        } else if (mAllowBackgroundAuthentication) {

        } else if (mAllowBackgroundAuthentication) {

            return true;

            return true;

        } else if (mIsForLegacyFingerprintManager) {

            return true;

        } else if (mIgnoreEnrollmentState) {

            return true;

        }

        }

        return false;

        return false;

    }

    }
@@ -144,6 +149,7 @@ public class PromptInfo implements Parcelable { 
        }

        }

        return false;

        return false;

    }

    }

    // LINT.ThenChange(frameworks/base/core/java/android/hardware/biometrics/BiometricPrompt.java)





    // Setters

    // Setters