diff options
| author | Justin Koh <justinkoh@google.com> | 2014-02-20 23:01:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-20 23:01:25 +0000 |
| commit | 0be0a5039b60ae4c1c8c0b6a1a2c0e7400d372d5 (patch) | |
| tree | b937df385a408d0709170f3f5b4252a38c22c96c | |
| parent | d85e7840b03b64b2aa75361b739d0316ef1a9270 (diff) | |
| parent | 7206ac561291298f08809614be95963966a72ca8 (diff) | |
| download | frameworks_base-0be0a5039b60ae4c1c8c0b6a1a2c0e7400d372d5.zip frameworks_base-0be0a5039b60ae4c1c8c0b6a1a2c0e7400d372d5.tar.gz frameworks_base-0be0a5039b60ae4c1c8c0b6a1a2c0e7400d372d5.tar.bz2 | |
am 7206ac56: am a79ac472: am 744d3473: Merge "Add hardware feature describing a watch." into klp-modular-dev
* commit '7206ac561291298f08809614be95963966a72ca8':
Add hardware feature describing a watch.
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 46ff80c..89a4692 100644 --- a/api/current.txt +++ b/api/current.txt @@ -7661,6 +7661,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 diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 40d9606..b648930 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -1257,6 +1257,15 @@ public abstract class PackageManager { 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. */ |