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

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

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

Change-Id: I2390838067d0fe65e5c2c7e48c405d713871018c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Diya Bera
2023-07-06 01:46:15 +00:00
committed by Automerger Merge Worker
parent 5b62cd0cc1 aa49280685
commit 6323441d51
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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(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(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(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(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,6 +126,7 @@ 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;
@@ -141,9 +142,14 @@ 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