summaryrefslogtreecommitdiffstats
path: root/native/android
diff options
context:
space:
mode:
authorAravind Akella <aakella@google.com>2014-04-07 22:55:21 +0000
committerAravind Akella <aakella@google.com>2014-04-11 00:05:24 +0000
commitcd9a7bb3ba742606f93dcbd549d6d6eeb1cb5247 (patch)
treed073c795af27b374151ddb9481e3789924d1614c /native/android
parent819239e5bec90ee3c861ac45fffac4a832a183a1 (diff)
downloadframeworks_base-cd9a7bb3ba742606f93dcbd549d6d6eeb1cb5247.zip
frameworks_base-cd9a7bb3ba742606f93dcbd549d6d6eeb1cb5247.tar.gz
frameworks_base-cd9a7bb3ba742606f93dcbd549d6d6eeb1cb5247.tar.bz2
Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
This reverts commit 819239e5bec90ee3c861ac45fffac4a832a183a1. Change-Id: I4bbb222e5c9dc65aed03aa28fd9e0f00fe335819
Diffstat (limited to 'native/android')
-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();
+}