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

Commit d9b9d410 authored by Jim Miller's avatar Jim Miller
Browse files

Add FEATURE_FINGERPRINT to PackageManager's feature list 

Fixes bug 22674557

Change-Id: I3d78e6bedc3ac18a25a06ac50e3a7eee4161fe70
parent 091f0e5c

api/current.txt

+2 −1
Original line number Diff line number Diff line
@@ -9313,6 +9313,7 @@ package android.content.pm { 
    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_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";
@@ -28825,11 +28826,11 @@ package android.service.voice { 
    method public void onHandleAssist(android.os.Bundle, android.app.assist.AssistStructure, android.app.assist.AssistContent);

    method public void onHandleScreenshot(android.graphics.Bitmap);

    method public void onHide();

    method public void onLockscreenShown();

    method public boolean onKeyDown(int, android.view.KeyEvent);

    method public boolean onKeyLongPress(int, android.view.KeyEvent);

    method public boolean onKeyMultiple(int, int, android.view.KeyEvent);

    method public boolean onKeyUp(int, android.view.KeyEvent);

    method public void onLockscreenShown();

    method public void onLowMemory();

    method public void onRequestAbortVoice(android.service.voice.VoiceInteractionSession.AbortVoiceRequest);

    method public void onRequestCommand(android.service.voice.VoiceInteractionSession.CommandRequest);

api/system-current.txt

+2 −1
Original line number Diff line number Diff line
@@ -9607,6 +9607,7 @@ package android.content.pm { 
    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_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";
@@ -30977,11 +30978,11 @@ package android.service.voice { 
    method public void onHandleAssist(android.os.Bundle, android.app.assist.AssistStructure, android.app.assist.AssistContent);

    method public void onHandleScreenshot(android.graphics.Bitmap);

    method public void onHide();

    method public void onLockscreenShown();

    method public boolean onKeyDown(int, android.view.KeyEvent);

    method public boolean onKeyLongPress(int, android.view.KeyEvent);

    method public boolean onKeyMultiple(int, int, android.view.KeyEvent);

    method public boolean onKeyUp(int, android.view.KeyEvent);

    method public void onLockscreenShown();

    method public void onLowMemory();

    method public void onRequestAbortVoice(android.service.voice.VoiceInteractionSession.AbortVoiceRequest);

    method public void onRequestCommand(android.service.voice.VoiceInteractionSession.CommandRequest);

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

+7 −0
Original line number Diff line number Diff line
@@ -1512,6 +1512,13 @@ public abstract class PackageManager { 
    @SdkConstant(SdkConstantType.FEATURE)

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



    /**

     * 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.fingerprint";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device supports portrait orientation