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

Commit af4a0838 authored by Isaac Chen's avatar Isaac Chen Committed by Automerger Merge Worker
Browse files

Merge "Revert "Require permission for hidden APIs in BiometricPrompt"" into... 

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

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



Change-Id: I4f9ce0b24307009cb621bd5dd508d38502f8bee2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d609801b ae1925ae

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

+0 −6
Original line number Diff line number Diff line
@@ -144,7 +144,6 @@ 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.
@@ -418,7 +417,6 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan 
         * @hide

         */

        @NonNull

        @RequiresPermission(USE_BIOMETRIC_INTERNAL)

        public Builder setDisallowBiometricsIfPolicyExists(boolean checkDevicePolicyManager) {

            mPromptInfo.setDisallowBiometricsIfPolicyExists(checkDevicePolicyManager);

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

         */

        @NonNull

        @RequiresPermission(USE_BIOMETRIC_INTERNAL)

        public Builder setReceiveSystemEvents(boolean set) {

            mPromptInfo.setReceiveSystemEvents(set);

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

         */

        @NonNull

        @RequiresPermission(USE_BIOMETRIC_INTERNAL)

        public Builder setIgnoreEnrollmentState(boolean ignoreEnrollmentState) {

            mPromptInfo.setIgnoreEnrollmentState(ignoreEnrollmentState);

            return this;
@@ -458,12 +454,10 @@ 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

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

    }



    // LINT.IfChange

    public boolean containsPrivateApiConfigurations() {

        if (mDisallowBiometricsIfPolicyExists) {

            return true;
@@ -142,14 +141,9 @@ 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