commit 79c004b2c11d6a84b7c0fb71480f99b3e5183540
author Peng Xu <pengxu@google.com> Fri Jan 22 00:44:28 2016 -0800
committer Nick Vaccaro <nvaccaro@google.com> Tue Jan 26 20:10:27 2016 +0000
tree 67045180551152a444faa6a2fc6e336192cf2d80
parent 2e7ecddd5bb13721e5b3d55ee96b9dcf2e9148e6

[DO NOT MERGE ANYWHERE] Fix bodysensor permission

Bug: 26481493
Bug: 26447970
Change-Id: Ibeaf5a5e39f0dc552cf115d2834a1ec28ecef5ab

native/android/sensor.cpp

diff --git a/native/android/sensor.cpp b/native/android/sensor.cpp
index 76c701a..8150726 100644
--- a/native/android/sensor.cpp
+++ b/native/android/sensor.cpp
@@ -52,13 +52,12 @@
     }
 }
 
-int ASensorManager_getSensorList(ASensorManager* manager,
-        ASensorList* list)
+int ASensorManager_getSensorList(ASensorManager* manager, ASensorList* list)
 {
-    Sensor const* const* l;
-    int c = static_cast<SensorManager*>(manager)->getSensorList(&l);
+    Sensor const* const* sensorPointerList;
+    int c = static_cast<SensorManager*>(manager)->getAvailableSensorList(&sensorPointerList);
     if (list) {
-        *list = reinterpret_cast<ASensorList>(l);
+        *list = reinterpret_cast<ASensorList>(sensorPointerList);
     }
     return c;
 }
@@ -71,7 +70,7 @@
 ASensor const* ASensorManager_getDefaultSensorEx(ASensorManager* manager,
         int type, bool wakeUp) {
     Sensor const* const* sensorList;
-    size_t size = static_cast<SensorManager*>(manager)->getSensorList(&sensorList);
+    size_t size = static_cast<SensorManager*>(manager)->getAvailableSensorList(&sensorList);
     for (size_t i = 0; i < size; ++i) {
         if (ASensor_getType(sensorList[i]) == type &&
             ASensor_isWakeUpSensor(sensorList[i]) == wakeUp) {