summaryrefslogtreecommitdiffstats
path: root/native
diff options
context:
space:
mode:
authorAravind Akella <aakella@google.com>2014-04-11 19:34:51 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-11 19:34:51 +0000
commit8ebd66c259602f6b0be26fdfd3fe2f55538f6424 (patch)
treeaa5e2f41ebf2eeb723cfd464ce4a51f54307b31d /native
parent9e99cab7d9a0ec2315140c21bb1958eb7ff76a09 (diff)
parentcd4c1c714c37a1bc7ba35ebd2509eca4f0f6a314 (diff)
downloadframeworks_base-8ebd66c259602f6b0be26fdfd3fe2f55538f6424.zip
frameworks_base-8ebd66c259602f6b0be26fdfd3fe2f55538f6424.tar.gz
frameworks_base-8ebd66c259602f6b0be26fdfd3fe2f55538f6424.tar.bz2
am cd4c1c71: Merge "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" into klp-modular-dev
* commit 'cd4c1c714c37a1bc7ba35ebd2509eca4f0f6a314': Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
Diffstat (limited to 'native')
-rw-r--r--native/android/sensor.cpp20
1 files changed, 20 insertions, 0 deletions
diff --git a/native/android/sensor.cpp b/native/android/sensor.cpp
index 76c6eda..fb4de9e 100644
--- a/native/android/sensor.cpp
+++ b/native/android/sensor.cpp
@@ -153,3 +153,23 @@ int ASensor_getMinDelay(ASensor const* sensor)
{
return static_cast<Sensor const*>(sensor)->getMinDelay();
}
+
+int ASensor_getFifoMaxEventCount(ASensor const* sensor)
+{
+ return static_cast<Sensor const*>(sensor)->getFifoMaxEventCount();
+}
+
+int ASensor_getFifoReservedEventCount(ASensor const* sensor)
+{
+ return static_cast<Sensor const*>(sensor)->getFifoReservedEventCount();
+}
+
+const char* ASensor_getStringType(ASensor const* sensor)
+{
+ return static_cast<Sensor const*>(sensor)->getStringType().string();
+}
+
+const char* ASensor_getRequiredPermission(ASensor const* sensor)
+{
+ return static_cast<Sensor const*>(sensor)->getRequiredPermission().string();
+}