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

Commit 9d3d90a2 authored by Ralph Nathan's avatar Ralph Nathan Committed by Android (Google) Code Review
Browse files

Merge "Add FEATURE_EMBEDDED to PackageManager"

parents 01e4eeb0 b8e0dee9

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -10182,6 +10182,7 @@ package android.content.pm { 
    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_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_FAKETOUCH = "android.hardware.faketouch";

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

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -10664,6 +10664,7 @@ package android.content.pm { 
    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_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_FAKETOUCH = "android.hardware.faketouch";

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

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -10212,6 +10212,7 @@ package android.content.pm { 
    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_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_FAKETOUCH = "android.hardware.faketouch";

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

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

+9 −0
Original line number Diff line number Diff line
@@ -2161,6 +2161,15 @@ public abstract class PackageManager { 
    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_WATCH = "android.hardware.type.watch";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: This is a device for IoT and may not have an UI. An embedded

     * device is defined as a full stack Android device with or without a display and no

     * user-installable apps.

     */

    @SdkConstant(SdkConstantType.FEATURE)

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



    /**

     * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}:

     * The device supports printing.