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