diff options
author | Aravind Akella <aakella@google.com> | 2014-04-11 19:40:31 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-11 19:40:31 +0000 |
commit | d951ab230d80631731ef12b5d76c678c30165d6a (patch) | |
tree | 62de29e78b420aab4917ed60001863e906940e80 /native | |
parent | 68b9d97593d2ec79892813ab06f1b89c41de64b0 (diff) | |
parent | 8ebd66c259602f6b0be26fdfd3fe2f55538f6424 (diff) | |
download | frameworks_base-d951ab230d80631731ef12b5d76c678c30165d6a.zip frameworks_base-d951ab230d80631731ef12b5d76c678c30165d6a.tar.gz frameworks_base-d951ab230d80631731ef12b5d76c678c30165d6a.tar.bz2 |
am 8ebd66c2: 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 '8ebd66c259602f6b0be26fdfd3fe2f55538f6424':
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.cpp | 20 |
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(); +} |