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

Commit 6323441d 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 am: aa492806 

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



Change-Id: I2390838067d0fe65e5c2c7e48c405d713871018c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5b62cd0c aa492806

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

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

        private IAuthService mService;



        // LINT.IfChange

        /**

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

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

         */

        @NonNull

        @RequiresPermission(USE_BIOMETRIC_INTERNAL)

        public Builder setDisallowBiometricsIfPolicyExists(boolean checkDevicePolicyManager) {

            mPromptInfo.setDisallowBiometricsIfPolicyExists(checkDevicePolicyManager);

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

         */

        @NonNull

        @RequiresPermission(USE_BIOMETRIC_INTERNAL)

        public Builder setReceiveSystemEvents(boolean set) {

            mPromptInfo.setReceiveSystemEvents(set);

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

         */

        @NonNull

        @RequiresPermission(USE_BIOMETRIC_INTERNAL)

        public Builder setIgnoreEnrollmentState(boolean ignoreEnrollmentState) {

            mPromptInfo.setIgnoreEnrollmentState(ignoreEnrollmentState);

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

         */

        @NonNull

        @RequiresPermission(USE_BIOMETRIC_INTERNAL)

        public Builder setIsForLegacyFingerprintManager(int sensorId) {

            mPromptInfo.setIsForLegacyFingerprintManager(sensorId);

            return this;

        }

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



        /**

         * Creates a {@link BiometricPrompt}.

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

+6 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ public class PromptInfo implements Parcelable { 
        return false;

    }



    // LINT.IfChange

    public boolean containsPrivateApiConfigurations() {

        if (mDisallowBiometricsIfPolicyExists) {

            return true;
@@ -141,9 +142,14 @@ public class PromptInfo implements Parcelable { 
            return true;

        } else if (mReceiveSystemEvents) {

            return true;

        } else if (mIgnoreEnrollmentState) {

            return true;

        } else if (mIsForLegacyFingerprintManager) {

            return true;

        }

        return false;

    }

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



    // Setters