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

Commit 2ae0e21c authored by Kevin Chyn's avatar Kevin Chyn Committed by Android (Google) Code Review
Browse files

Merge "Move biometrics into biometric namespace"

parents dd54e67f 5c5603d1

api/current.txt

+4 −3
Original line number Diff line number Diff line
@@ -11565,18 +11565,19 @@ package android.content.pm { 
    field public static final java.lang.String FEATURE_DEVICE_ADMIN = "android.software.device_admin";

    field public static final java.lang.String FEATURE_EMBEDDED = "android.hardware.type.embedded";

    field public static final java.lang.String FEATURE_ETHERNET = "android.hardware.ethernet";

    field public static final java.lang.String FEATURE_FACE = "android.hardware.face";

    field public static final java.lang.String FEATURE_FACE = "android.hardware.biometrics.face";

    field public static final java.lang.String FEATURE_FAKETOUCH = "android.hardware.faketouch";

    field public static final java.lang.String FEATURE_FAKETOUCH_MULTITOUCH_DISTINCT = "android.hardware.faketouch.multitouch.distinct";

    field public static final java.lang.String FEATURE_FAKETOUCH_MULTITOUCH_JAZZHAND = "android.hardware.faketouch.multitouch.jazzhand";

    field public static final java.lang.String FEATURE_FINGERPRINT = "android.hardware.fingerprint";

    field public static final java.lang.String FEATURE_FINGERPRINT = "android.hardware.biometrics.fingerprint";

    field public static final java.lang.String FEATURE_FINGERPRINT_PRE_29 = "android.hardware.fingerprint";

    field public static final java.lang.String FEATURE_FREEFORM_WINDOW_MANAGEMENT = "android.software.freeform_window_management";

    field public static final java.lang.String FEATURE_GAMEPAD = "android.hardware.gamepad";

    field public static final java.lang.String FEATURE_HIFI_SENSORS = "android.hardware.sensor.hifi_sensors";

    field public static final java.lang.String FEATURE_HOME_SCREEN = "android.software.home_screen";

    field public static final java.lang.String FEATURE_INPUT_METHODS = "android.software.input_methods";

    field public static final java.lang.String FEATURE_IPSEC_TUNNELS = "android.software.ipsec_tunnels";

    field public static final java.lang.String FEATURE_IRIS = "android.hardware.iris";

    field public static final java.lang.String FEATURE_IRIS = "android.hardware.biometrics.iris";

    field public static final java.lang.String FEATURE_LEANBACK = "android.software.leanback";

    field public static final java.lang.String FEATURE_LEANBACK_ONLY = "android.software.leanback_only";

    field public static final java.lang.String FEATURE_LIVE_TV = "android.software.live_tv";

core/java/android/content/pm/PackageManager.java

+10 −3
Original line number Diff line number Diff line
@@ -2288,21 +2288,28 @@ public abstract class PackageManager { 
     * {@link #hasSystemFeature}: The device has biometric hardware to detect a fingerprint.

     */

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_FINGERPRINT = "android.hardware.fingerprint";

    public static final String FEATURE_FINGERPRINT_PRE_29 = "android.hardware.fingerprint";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device has biometric hardware to detect a fingerprint.

     */

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_FINGERPRINT = "android.hardware.biometrics.fingerprint";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device has biometric hardware to perform face authentication.

     */

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_FACE = "android.hardware.face";

    public static final String FEATURE_FACE = "android.hardware.biometrics.face";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device has biometric hardware to perform iris authentication.

     */

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_IRIS = "android.hardware.iris";

    public static final String FEATURE_IRIS = "android.hardware.biometrics.iris";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and