From b02e6050bd8f250d52d59e7fe2096dd420cec730 Mon Sep 17 00:00:00 2001
From: Aravind Akella <aakella@google.com>
Date: Tue, 30 Jun 2015 18:02:45 -0700
Subject: [PATCH] Fix for last sensor missing from sensor list returned by the
 HAL.

Bug: 22072216
Change-Id: I39a422fb80adcd348ff9c10bf3d3f19ab569a0af
---
 core/java/android/hardware/SystemSensorManager.java | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/core/java/android/hardware/SystemSensorManager.java b/core/java/android/hardware/SystemSensorManager.java
index d7960afcf86f5..f218528afdbf5 100644
--- a/core/java/android/hardware/SystemSensorManager.java
+++ b/core/java/android/hardware/SystemSensorManager.java
@@ -85,15 +85,14 @@ public class SystemSensorManager extends SensorManager {
 
         // initialize the sensor list
         int i = 0;
-        while(true) {
+        do {
             Sensor sensor = new Sensor();
             i = nativeGetNextSensor(mNativeInstance, sensor, i);
-            if (i <= 0) {
-                break;
+            if (i >= 0) {
+                mFullSensorsList.add(sensor);
+                mHandleToSensor.append(sensor.getHandle(), sensor);
             }
-            mFullSensorsList.add(sensor);
-            mHandleToSensor.append(sensor.getHandle(), sensor);
-        }
+        } while (i > 0);
     }