Merge "Require internal permission for BIOMETRIC_CONVENIENCE"
diff --git a/api/system-current.txt b/api/system-current.txt
index 011c487..ce1decc 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -2453,8 +2453,8 @@
package android.hardware.biometrics {
public static interface BiometricManager.Authenticators {
- field public static final int BIOMETRIC_CONVENIENCE = 4095; // 0xfff
- field public static final int EMPTY_SET = 0; // 0x0
+ field @RequiresPermission(android.Manifest.permission.WRITE_DEVICE_CONFIG) public static final int BIOMETRIC_CONVENIENCE = 4095; // 0xfff
+ field @RequiresPermission(android.Manifest.permission.WRITE_DEVICE_CONFIG) public static final int EMPTY_SET = 0; // 0x0
}
}
diff --git a/core/java/android/hardware/biometrics/BiometricManager.java b/core/java/android/hardware/biometrics/BiometricManager.java
index 4c114fd..125b676 100644
--- a/core/java/android/hardware/biometrics/BiometricManager.java
+++ b/core/java/android/hardware/biometrics/BiometricManager.java
@@ -18,6 +18,7 @@
import static android.Manifest.permission.USE_BIOMETRIC;
import static android.Manifest.permission.USE_BIOMETRIC_INTERNAL;
+import static android.Manifest.permission.WRITE_DEVICE_CONFIG;
import android.annotation.IntDef;
import android.annotation.RequiresPermission;
@@ -87,9 +88,15 @@
/**
* Empty set with no authenticators specified.
+ *
+ * <p>This constant is intended for use by {@link android.provider.DeviceConfig} to adjust
+ * the reported strength of a biometric sensor. It is not a valid parameter for any of the
+ * public {@link android.hardware.biometrics} APIs.
+ *
* @hide
*/
@SystemApi
+ @RequiresPermission(WRITE_DEVICE_CONFIG)
int EMPTY_SET = 0x0000;
/**
@@ -115,12 +122,16 @@
/**
* Any biometric (e.g. fingerprint, iris, or face) on the device that meets or exceeds the
- * requirements for <strong>Convenience</strong>, as defined by the Android CDD. This
- * is not a valid parameter to any of the {@link android.hardware.biometrics} APIs, since
- * the CDD allows only {@link #BIOMETRIC_WEAK} and stronger authenticators to participate.
+ * requirements for <strong>Convenience</strong>, as defined by the Android CDD.
+ *
+ * <p>This constant is intended for use by {@link android.provider.DeviceConfig} to adjust
+ * the reported strength of a biometric sensor. It is not a valid parameter for any of the
+ * public {@link android.hardware.biometrics} APIs.
+ *
* @hide
*/
@SystemApi
+ @RequiresPermission(WRITE_DEVICE_CONFIG)
int BIOMETRIC_CONVENIENCE = 0x0FFF;
/**