Merge "Clean up get sensorList." into mnc-dev

1 files changed, 7 insertions, 9 deletions

diff --git a/core/java/android/hardware/SystemSensorManager.java b/core/java/android/hardware/SystemSensorManager.java
index 85474a8..e7deae8 100644
--- a/core/java/android/hardware/SystemSensorManager.java
+++ b/core/java/android/hardware/SystemSensorManager.java
@@ -42,7 +42,8 @@ import java.util.List;
 public class SystemSensorManager extends SensorManager {
     private static native void nativeClassInit();
     private static native long nativeCreate(String opPackageName);
-    private static native int nativeGetNextSensor(long nativeInstance, Sensor sensor, int next);
+    private static native boolean nativeGetSensorAtIndex(long nativeInstance,
+            Sensor sensor, int index);
     private static native boolean nativeIsDataInjectionEnabled(long nativeInstance);
 
     private static boolean sSensorModuleInitialized = false;
@@ -80,15 +81,12 @@ public class SystemSensorManager extends SensorManager {
         }
 
         // initialize the sensor list
-        int i = 0;
-        do {
+        for (int index = 0;;++index) {
             Sensor sensor = new Sensor();
-            i = nativeGetNextSensor(mNativeInstance, sensor, i);
-            if (i >= 0) {
-                mFullSensorsList.add(sensor);
-                mHandleToSensor.append(sensor.getHandle(), sensor);
-            }
-        } while (i > 0);
+            if (!nativeGetSensorAtIndex(mNativeInstance, sensor, index)) break;
+            mFullSensorsList.add(sensor);
+            mHandleToSensor.append(sensor.getHandle(), sensor);
+        }
     }