summaryrefslogtreecommitdiffstats
path: root/core/java/android/content
diff options
context:
space:
mode:
authorAravind Akella <aakella@google.com>2014-07-14 23:31:54 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-07-14 18:38:08 +0000
commit8b674abf4d83db29ae1e7488dbdb520edf970e67 (patch)
tree6e41ec6bec09c99db97f4bb1a69cd582e9ca1ab0 /core/java/android/content
parent77ec2ceac689d80c8e645da4a83f0e5af8077cbc (diff)
parent8b8e74bd74e5a4bc4316d4bf0fc84cb46106e3ab (diff)
downloadframeworks_base-8b674abf4d83db29ae1e7488dbdb520edf970e67.zip
frameworks_base-8b674abf4d83db29ae1e7488dbdb520edf970e67.tar.gz
frameworks_base-8b674abf4d83db29ae1e7488dbdb520edf970e67.tar.bz2
Merge "Add PackageManager feature strings for relative humidity and temperature sensors." into lmp-dev
Diffstat (limited to 'core/java/android/content')
-rw-r--r--core/java/android/content/pm/PackageManager.java16
1 files changed, 16 insertions, 0 deletions
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index 91ebbbf..376369a 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -1167,6 +1167,22 @@ public abstract class PackageManager {
/**
* Feature for {@link #getSystemAvailableFeatures} and
+ * {@link #hasSystemFeature}: The device includes a relative humidity sensor.
+ */
+ @SdkConstant(SdkConstantType.FEATURE)
+ public static final String FEATURE_SENSOR_RELATIVE_HUMIDITY =
+ "android.hardware.sensor.relative_humidity";
+
+ /**
+ * Feature for {@link #getSystemAvailableFeatures} and
+ * {@link #hasSystemFeature}: The device includes an ambient temperature sensor.
+ */
+ @SdkConstant(SdkConstantType.FEATURE)
+ public static final String FEATURE_SENSOR_AMBIENT_TEMPERATURE =
+ "android.hardware.sensor.ambient_temperature";
+
+ /**
+ * Feature for {@link #getSystemAvailableFeatures} and
* {@link #hasSystemFeature}: The device has a telephony radio with data
* communication support.
*/