summaryrefslogtreecommitdiffstats
path: root/native/android
diff options
context:
space:
mode:
authorEtienne Le Grand <etn@google.com>2014-04-05 09:05:50 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-05 09:05:50 +0000
commitacf395fd9441bce9fbe68c1b7efbf824570284bc (patch)
treede95b1b5999e82a26832560cfdfa7cf663bd6973 /native/android
parentbdfe384106de364ea2effac6ab80108556d11649 (diff)
parent819239e5bec90ee3c861ac45fffac4a832a183a1 (diff)
downloadframeworks_base-acf395fd9441bce9fbe68c1b7efbf824570284bc.zip
frameworks_base-acf395fd9441bce9fbe68c1b7efbf824570284bc.tar.gz
frameworks_base-acf395fd9441bce9fbe68c1b7efbf824570284bc.tar.bz2
am 819239e5: Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor"
* commit '819239e5bec90ee3c861ac45fffac4a832a183a1': Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor"
Diffstat (limited to 'native/android')
-rw-r--r--native/android/sensor.cpp20
1 files changed, 0 insertions, 20 deletions
diff --git a/native/android/sensor.cpp b/native/android/sensor.cpp
index fb4de9e..76c6eda 100644
--- a/native/android/sensor.cpp
+++ b/native/android/sensor.cpp
@@ -153,23 +153,3 @@ 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();
-}