summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorAlex Ray <aray@google.com>2013-10-04 14:18:37 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-04 14:18:37 -0700
commit849ef427b804c3d308e2d74eebd64e19144ef976 (patch)
tree54f230b7dc8d6aa950e08df8e9b0ee058ca6d872 /core
parent2cf2948dbf15e8c0645154957f511379d8ef53bf (diff)
parent2bbf0bfc16358382589d56efcc0ea9e63807e941 (diff)
downloadframeworks_base-849ef427b804c3d308e2d74eebd64e19144ef976.zip
frameworks_base-849ef427b804c3d308e2d74eebd64e19144ef976.tar.gz
frameworks_base-849ef427b804c3d308e2d74eebd64e19144ef976.tar.bz2
am 2bbf0bfc: am 0ab7c883: Merge "Add Consumer IR feature" into klp-dev
* commit '2bbf0bfc16358382589d56efcc0ea9e63807e941': 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 9203af9..b63db8a 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -915,6 +915,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.
*/