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

Commit 421858b1 authored by Curtis Belmonte's avatar Curtis Belmonte
Browse files

Require internal permission for BIOMETRIC_CONVENIENCE 

At the request of Android API council, this commit adds the
@RequirePermission annotation to the @SystemApi constant
BiometricManager.Authenticators#BIOMETRIC_CONVENIENCE.

Test: atest com.android.server.biometrics
Fixes: 148596159
Change-Id: I9ec3fdf70b0abde601301012c8940116462fcc38
parent 98c8991c

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -2451,8 +2451,8 @@ package android.hardware { 
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















  }





























}

































core/java/android/hardware/biometrics/BiometricManager.java



+14
−3




























Original line number
Diff line number
Diff line








@@ -18,6 +18,7 @@ package android.hardware.biometrics;





























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 @@ public class BiometricManager {





























        /**















         * 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 @@ public class BiometricManager {





























        /**















         * 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;































        /**