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

Commit 526e9a00 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "FEATURE_FINGERPRINT is back to android.hardware.fingerprint"

parents c1cebf5d 59c2da71

api/current.txt

+1 −2
Original line number Diff line number Diff line
@@ -11651,8 +11651,7 @@ package android.content.pm { 
    field public static final String FEATURE_FAKETOUCH = "android.hardware.faketouch";

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

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

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

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

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

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

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

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

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

+1 −8
Original line number Diff line number Diff line
@@ -2346,14 +2346,7 @@ public abstract class PackageManager { 
     * {@link #hasSystemFeature}: The device has biometric hardware to detect a fingerprint.

     */

    @SdkConstant(SdkConstantType.FEATURE)

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

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



    /**

     * Feature for {@link #getSystemAvailableFeatures} and