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

Commit 5c5603d1 authored by Kevin Chyn's avatar Kevin Chyn
Browse files

Move biometrics into biometric namespace 

Bug: 115639644

Test: Fingerprint still works on older devices
Test: atest FingerprintFeatureCompatTest
Change-Id: I6c316e183f90c8c84179a0f0488f41c130bfd25f
parent aec2e0d9

api/current.txt

+7 −6
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ package android { 
    field public static final java.lang.String BROADCAST_SMS = "android.permission.BROADCAST_SMS";

    field public static final java.lang.String BROADCAST_STICKY = "android.permission.BROADCAST_STICKY";

    field public static final java.lang.String BROADCAST_WAP_PUSH = "android.permission.BROADCAST_WAP_PUSH";

    field public static final java.lang.String CALL_COMPANION_APP = "android.permission.CALL_COMPANION_APP";

    field public static final java.lang.String CALL_PHONE = "android.permission.CALL_PHONE";

    field public static final java.lang.String CALL_PRIVILEGED = "android.permission.CALL_PRIVILEGED";

    field public static final java.lang.String CAMERA = "android.permission.CAMERA";
@@ -91,7 +92,6 @@ package android { 
    field public static final java.lang.String LOCATION_HARDWARE = "android.permission.LOCATION_HARDWARE";

    field public static final java.lang.String MANAGE_DOCUMENTS = "android.permission.MANAGE_DOCUMENTS";

    field public static final java.lang.String MANAGE_OWN_CALLS = "android.permission.MANAGE_OWN_CALLS";

    field public static final java.lang.String CALL_COMPANION_APP = "android.permission.CALL_COMPANION_APP";

    field public static final java.lang.String MASTER_CLEAR = "android.permission.MASTER_CLEAR";

    field public static final java.lang.String MEDIA_CONTENT_CONTROL = "android.permission.MEDIA_CONTENT_CONTROL";

    field public static final java.lang.String MODIFY_AUDIO_SETTINGS = "android.permission.MODIFY_AUDIO_SETTINGS";
@@ -11557,18 +11557,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";
@@ -43179,6 +43180,7 @@ package android.telecom { 
    field public static final java.lang.String EXTRA_INCOMING_CALL_EXTRAS = "android.telecom.extra.INCOMING_CALL_EXTRAS";

    field public static final java.lang.String EXTRA_INCOMING_VIDEO_STATE = "android.telecom.extra.INCOMING_VIDEO_STATE";

    field public static final java.lang.String EXTRA_IS_DEFAULT_CALL_SCREENING_APP = "android.telecom.extra.IS_DEFAULT_CALL_SCREENING_APP";

    field public static final java.lang.String EXTRA_IS_ENABLED = "android.telecom.extra.IS_ENABLED";

    field public static final java.lang.String EXTRA_NOTIFICATION_COUNT = "android.telecom.extra.NOTIFICATION_COUNT";

    field public static final java.lang.String EXTRA_NOTIFICATION_PHONE_NUMBER = "android.telecom.extra.NOTIFICATION_PHONE_NUMBER";

    field public static final java.lang.String EXTRA_OUTGOING_CALL_EXTRAS = "android.telecom.extra.OUTGOING_CALL_EXTRAS";
@@ -43186,14 +43188,13 @@ package android.telecom { 
    field public static final java.lang.String EXTRA_START_CALL_WITH_RTT = "android.telecom.extra.START_CALL_WITH_RTT";

    field public static final java.lang.String EXTRA_START_CALL_WITH_SPEAKERPHONE = "android.telecom.extra.START_CALL_WITH_SPEAKERPHONE";

    field public static final java.lang.String EXTRA_START_CALL_WITH_VIDEO_STATE = "android.telecom.extra.START_CALL_WITH_VIDEO_STATE";

    field public static final java.lang.String EXTRA_IS_ENABLED = "android.telecom.extra.IS_ENABLED";

    field public static final java.lang.String GATEWAY_ORIGINAL_ADDRESS = "android.telecom.extra.GATEWAY_ORIGINAL_ADDRESS";

    field public static final java.lang.String GATEWAY_PROVIDER_PACKAGE = "android.telecom.extra.GATEWAY_PROVIDER_PACKAGE";

    field public static final java.lang.String METADATA_INCLUDE_EXTERNAL_CALLS = "android.telecom.INCLUDE_EXTERNAL_CALLS";

    field public static final java.lang.String METADATA_INCLUDE_SELF_MANAGED_CALLS = "android.telecom.INCLUDE_SELF_MANAGED_CALLS";

    field public static final java.lang.String METADATA_IN_CALL_SERVICE_CAR_MODE_UI = "android.telecom.IN_CALL_SERVICE_CAR_MODE_UI";

    field public static final java.lang.String METADATA_IN_CALL_SERVICE_RINGING = "android.telecom.IN_CALL_SERVICE_RINGING";

    field public static final java.lang.String METADATA_IN_CALL_SERVICE_UI = "android.telecom.IN_CALL_SERVICE_UI";

    field public static final java.lang.String METADATA_IN_CALL_SERVICE_CAR_MODE_UI = "android.telecom.IN_CALL_SERVICE_CAR_MODE_UI";

    field public static final int PRESENTATION_ALLOWED = 1; // 0x1

    field public static final int PRESENTATION_PAYPHONE = 4; // 0x4

    field public static final int PRESENTATION_RESTRICTED = 2; // 0x2

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