diff options
author | Vinod Krishnan <vinodkrishnan@google.com> | 2014-05-07 22:57:45 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-07 22:57:45 +0000 |
commit | 7d3387bc13427b61708d5a39fc4f626ee869ecdc (patch) | |
tree | d8dfab431c5155b776a72678dfeaf46365406fd7 /core/java/android/content/pm | |
parent | 531fecca1c55d2f60977a57f5eb546d4d202fb97 (diff) | |
parent | 03498d349ae3aa5e429e999b97036d194981373f (diff) | |
download | frameworks_base-7d3387bc13427b61708d5a39fc4f626ee869ecdc.zip frameworks_base-7d3387bc13427b61708d5a39fc4f626ee869ecdc.tar.gz frameworks_base-7d3387bc13427b61708d5a39fc4f626ee869ecdc.tar.bz2 |
am 03498d34: am b9d71fa1: Merge "Adding a HeartRate Feature" into klp-modular-dev
* commit '03498d349ae3aa5e429e999b97036d194981373f':
Adding a HeartRate Feature
Diffstat (limited to 'core/java/android/content/pm')
-rw-r--r-- | core/java/android/content/pm/PackageManager.java | 7 |
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. */ |