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

Commit 744d3473 authored by Justin Koh's avatar Justin Koh Committed by Android (Google) Code Review
Browse files

Merge "Add hardware feature describing a watch." into klp-modular-dev

parents d43ad2f3 b5731f09

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -7335,6 +7335,7 @@ package android.content.pm { 
    field public static final java.lang.String FEATURE_TOUCHSCREEN_MULTITOUCH_JAZZHAND = "android.hardware.touchscreen.multitouch.jazzhand";

    field public static final java.lang.String FEATURE_USB_ACCESSORY = "android.hardware.usb.accessory";

    field public static final java.lang.String FEATURE_USB_HOST = "android.hardware.usb.host";

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

    field public static final java.lang.String FEATURE_WIFI = "android.hardware.wifi";

    field public static final java.lang.String FEATURE_WIFI_DIRECT = "android.hardware.wifi.direct";

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

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

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

    public static final String FEATURE_TELEVISION = "android.hardware.type.television";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: This is a device dedicated to showing UI

     * on a watch. A watch here is defined to be a device worn on the body, perhaps on

     * the wrist. The user is very close when interacting with the device.

     */

    @SdkConstant(SdkConstantType.FEATURE)

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



    /**

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

     * The device supports printing.