diff options
| author | 2014-05-07 21:46:45 +0000 | |
|---|---|---|
| committer | 2014-05-07 21:46:45 +0000 | |
| commit | 03498d349ae3aa5e429e999b97036d194981373f (patch) | |
| tree | ee20aaaf6c5afcb51005d5d032703a218eb9f387 | |
| parent | 0b5598c924fc140db5cfee08c17fd91e630b1c9e (diff) | |
| parent | b9d71fa1081dc318a811b60660009d0769c02971 (diff) | |
am b9d71fa1: Merge "Adding a HeartRate Feature" into klp-modular-dev
* commit 'b9d71fa1081dc318a811b60660009d0769c02971':
Adding a HeartRate Feature
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index ef7aa0ab0430..0832450ca8da 100644 --- a/api/current.txt +++ b/api/current.txt @@ -7324,6 +7324,7 @@ package android.content.pm { field public static final java.lang.String FEATURE_SENSOR_BAROMETER = "android.hardware.sensor.barometer"; field public static final java.lang.String FEATURE_SENSOR_COMPASS = "android.hardware.sensor.compass"; field public static final java.lang.String FEATURE_SENSOR_GYROSCOPE = "android.hardware.sensor.gyroscope"; + field public static final java.lang.String FEATURE_SENSOR_HEART_RATE = "android.hardware.sensor.heartrate"; field public static final java.lang.String FEATURE_SENSOR_LIGHT = "android.hardware.sensor.light"; field public static final java.lang.String FEATURE_SENSOR_PROXIMITY = "android.hardware.sensor.proximity"; field public static final java.lang.String FEATURE_SENSOR_STEP_COUNTER = "android.hardware.sensor.stepcounter"; diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 226f5a6ffd17..18ac3fe5158c 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -1060,6 +1060,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. */ |