Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Isaac Chen
2023-07-06 07:47:30 +00:00
committed by Android (Google) Code Review
parent 69976e06c5 5dfc569e85
commit ae1925ae48
2 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/hardware/biometrics/BiometricPrompt.java
View File

@@ -144,7 +144,6 @@ 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.
@@ -418,7 +417,6 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan
* @hide * @hide
*/ */
@NonNull @NonNull
@RequiresPermission(USE_BIOMETRIC_INTERNAL)
public Builder setDisallowBiometricsIfPolicyExists(boolean checkDevicePolicyManager) { public Builder setDisallowBiometricsIfPolicyExists(boolean checkDevicePolicyManager) {
mPromptInfo.setDisallowBiometricsIfPolicyExists(checkDevicePolicyManager); mPromptInfo.setDisallowBiometricsIfPolicyExists(checkDevicePolicyManager);
return this; return this;
@@ -431,7 +429,6 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan
* @hide * @hide
*/ */
@NonNull @NonNull
@RequiresPermission(USE_BIOMETRIC_INTERNAL)
public Builder setReceiveSystemEvents(boolean set) { public Builder setReceiveSystemEvents(boolean set) {
mPromptInfo.setReceiveSystemEvents(set); mPromptInfo.setReceiveSystemEvents(set);
return this; return this;
@@ -445,7 +442,6 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan
* @hide * @hide
*/ */
@NonNull @NonNull
@RequiresPermission(USE_BIOMETRIC_INTERNAL)
public Builder setIgnoreEnrollmentState(boolean ignoreEnrollmentState) { public Builder setIgnoreEnrollmentState(boolean ignoreEnrollmentState) {
mPromptInfo.setIgnoreEnrollmentState(ignoreEnrollmentState); mPromptInfo.setIgnoreEnrollmentState(ignoreEnrollmentState);
return this; return this;
@@ -458,12 +454,10 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan
* @hide * @hide
*/ */
@NonNull @NonNull
@RequiresPermission(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}.

6
core/java/android/hardware/biometrics/PromptInfo.java
View File

@@ -126,7 +126,6 @@ public class PromptInfo implements Parcelable {
return false; return false;
} }
// LINT.IfChange
public boolean containsPrivateApiConfigurations() { public boolean containsPrivateApiConfigurations() {
if (mDisallowBiometricsIfPolicyExists) { if (mDisallowBiometricsIfPolicyExists) {
return true; return true;
@@ -142,14 +141,9 @@ public class PromptInfo implements Parcelable {
return true; return true;
} else if (mReceiveSystemEvents) { } else if (mReceiveSystemEvents) {
return true; return true;
} else if (mIgnoreEnrollmentState) {
return true;
} else if (mIsForLegacyFingerprintManager) {
return true;
} }
return false; return false;
} }
// LINT.ThenChange(frameworks/base/core/java/android/hardware/biometrics/BiometricPrompt.java)
// Setters // Setters