summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorVinod Krishnan <vinodkrishnan@google.com>2014-05-07 23:44:59 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-07 23:44:59 +0000
commit6c6fd8ad50473d55e0c41a162d99dca15dbfa2ea (patch)
treef896dafef11499846a885d7727241e042eceddf5 /core
parent5a04eb521250dd38517381013e7845924e22a047 (diff)
parent7d3387bc13427b61708d5a39fc4f626ee869ecdc (diff)
downloadframeworks_base-6c6fd8ad50473d55e0c41a162d99dca15dbfa2ea.zip
frameworks_base-6c6fd8ad50473d55e0c41a162d99dca15dbfa2ea.tar.gz
frameworks_base-6c6fd8ad50473d55e0c41a162d99dca15dbfa2ea.tar.bz2
am f2150734: am 03498d34: am b9d71fa1: Merge "Adding a HeartRate Feature" into klp-modular-dev
* commit 'f215073420706e29305da762fa5f9f53dcf330ff': Adding a HeartRate Feature
Diffstat (limited to 'core')
-rw-r--r--core/java/android/content/pm/PackageManager.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index 1a003ff..52a169b 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -1083,6 +1083,13 @@ public abstract class PackageManager {
/**
* Feature for {@link #getSystemAvailableFeatures} and
+ * {@link #hasSystemFeature}: The device includes a heart rate monitor.
+ */
+ @SdkConstant(SdkConstantType.FEATURE)
+ public static final String FEATURE_SENSOR_HEART_RATE = "android.hardware.sensor.heartrate";
+
+ /**
+ * Feature for {@link #getSystemAvailableFeatures} and
* {@link #hasSystemFeature}: The device has a telephony radio with data
* communication support.
*/