summaryrefslogtreecommitdiffstats
path: root/native
diff options
context:
space:
mode:
authorEtienne Le Grand <etn@google.com>2014-04-05 01:52:27 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-05 01:52:27 +0000
commitbdfe384106de364ea2effac6ab80108556d11649 (patch)
treea35fa2f1dffa3cd29947563ed584a4115b7a634c /native
parent8e2a4b539509f03c4b3521574a910f2ea3296a66 (diff)
parentfd53d8352a4617941b0a0449390aa562a01ea1d3 (diff)
downloadframeworks_base-bdfe384106de364ea2effac6ab80108556d11649.zip
frameworks_base-bdfe384106de364ea2effac6ab80108556d11649.tar.gz
frameworks_base-bdfe384106de364ea2effac6ab80108556d11649.tar.bz2
am fd53d835: Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
* commit 'fd53d8352a4617941b0a0449390aa562a01ea1d3': 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();
+}