summaryrefslogtreecommitdiffstats
path: root/native
diff options
context:
space:
mode:
authorAravind Akella <aakella@google.com>2014-04-11 19:32:38 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-04-11 19:32:38 +0000
commitcd4c1c714c37a1bc7ba35ebd2509eca4f0f6a314 (patch)
tree06467644c156434d6e7b1ce57dd0566b190dd01f /native
parent970417c7d3e33ccbd6918e28d9bc5da24651f5b3 (diff)
parentcd9a7bb3ba742606f93dcbd549d6d6eeb1cb5247 (diff)
downloadframeworks_base-cd4c1c714c37a1bc7ba35ebd2509eca4f0f6a314.zip
frameworks_base-cd4c1c714c37a1bc7ba35ebd2509eca4f0f6a314.tar.gz
frameworks_base-cd4c1c714c37a1bc7ba35ebd2509eca4f0f6a314.tar.bz2
Merge "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" into klp-modular-dev
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();
+}