summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorVinod Krishnan <vinodkrishnan@google.com>2014-05-07 21:46:45 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-07 21:46:45 +0000
commit03498d349ae3aa5e429e999b97036d194981373f (patch)
treeee20aaaf6c5afcb51005d5d032703a218eb9f387 /api
parent0b5598c924fc140db5cfee08c17fd91e630b1c9e (diff)
parentb9d71fa1081dc318a811b60660009d0769c02971 (diff)
downloadframeworks_base-03498d349ae3aa5e429e999b97036d194981373f.zip
frameworks_base-03498d349ae3aa5e429e999b97036d194981373f.tar.gz
frameworks_base-03498d349ae3aa5e429e999b97036d194981373f.tar.bz2
am b9d71fa1: Merge "Adding a HeartRate Feature" into klp-modular-dev
* commit 'b9d71fa1081dc318a811b60660009d0769c02971': Adding a HeartRate Feature
Diffstat (limited to 'api')
-rw-r--r--api/current.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index ef7aa0a..0832450 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";