summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorJustin Koh <justinkoh@google.com>2014-02-20 17:41:31 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-20 17:41:31 +0000
commita79ac472d71de6d13f3561012ca0e870bd9fe04b (patch)
tree72c9dd8ac9feec40e32df788d1b976dd0ed3068e /core/java/android
parentc95ed62111e0b8aceda4322011ad019c28987cbc (diff)
parent744d3473f8a0f9f95e3fdf83670faf6d1551839e (diff)
am 744d3473: Merge "Add hardware feature describing a watch." into klp-modular-dev
* commit '744d3473f8a0f9f95e3fdf83670faf6d1551839e': Add hardware feature describing a watch.
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/content/pm/PackageManager.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index 485ee68746ee..ddf0ed6259b2 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -1249,6 +1249,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.
*/