summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorAlex Ray <aray@google.com>2013-10-04 14:21:20 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-04 14:21:20 -0700
commit1ac74b74fffd2897046b895eff3e9c6636955a33 (patch)
treee59bd49dfee177a14178c519bbb395f35d6b9df9 /core
parentf16e56c83429e042d2b7376a4f01f3f2f139a0c3 (diff)
parent849ef427b804c3d308e2d74eebd64e19144ef976 (diff)
downloadframeworks_base-1ac74b74fffd2897046b895eff3e9c6636955a33.zip
frameworks_base-1ac74b74fffd2897046b895eff3e9c6636955a33.tar.gz
frameworks_base-1ac74b74fffd2897046b895eff3e9c6636955a33.tar.bz2
am 849ef427: am 2bbf0bfc: am 0ab7c883: Merge "Add Consumer IR feature" into klp-dev
* commit '849ef427b804c3d308e2d74eebd64e19144ef976': Add Consumer IR feature
Diffstat (limited to 'core')
-rw-r--r--core/java/android/content/pm/PackageManager.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index 7d373cc..c0a7905 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -923,6 +923,14 @@ public abstract class PackageManager {
/**
* Feature for {@link #getSystemAvailableFeatures} and
+ * {@link #hasSystemFeature}: The device is capable of communicating with
+ * consumer IR devices.
+ */
+ @SdkConstant(SdkConstantType.FEATURE)
+ public static final String FEATURE_CONSUMER_IR = "android.hardware.consumerir";
+
+ /**
+ * Feature for {@link #getSystemAvailableFeatures} and
* {@link #hasSystemFeature}: The device supports one or more methods of
* reporting current location.
*/