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

Commit de4e52aa authored by Ihab Awad's avatar Ihab Awad Committed by Android (Google) Code Review
Browse files

Merge "Add system feature for ConnectionService API support (1/3)" into lmp-dev

parents 5ff1d4f8 1ec68886

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -8744,6 +8744,7 @@ package android.content.pm { 
    field public static final java.lang.String FEATURE_CAMERA_FLASH = "android.hardware.camera.flash";

    field public static final java.lang.String FEATURE_CAMERA_FRONT = "android.hardware.camera.front";

    field public static final java.lang.String FEATURE_CAMERA_LEVEL_FULL = "android.hardware.camera.level.full";

    field public static final java.lang.String FEATURE_CONNECTION_SERVICE = "android.software.connectionservice";

    field public static final java.lang.String FEATURE_CONSUMER_IR = "android.hardware.consumerir";

    field public static final java.lang.String FEATURE_DEVICE_ADMIN = "android.software.device_admin";

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

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

+9 −3
Original line number Diff line number Diff line
@@ -1294,6 +1294,13 @@ public abstract class PackageManager { 
    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_SIP_VOIP = "android.software.sip.voip";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The Connection Service API is enabled on the device.

     */

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_CONNECTION_SERVICE = "android.software.connectionservice";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device's display has a touch screen.
@@ -1301,7 +1308,6 @@ public abstract class PackageManager { 
    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_TOUCHSCREEN = "android.hardware.touchscreen";





    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device's touch screen supports