commit a817c90a7ab296473345b0e106acc9be4e5b678c
author Aravind Akella <aakella@google.com> Mon Oct 19 21:15:28 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 19 21:15:28 2015 +0000
tree 5cbc9e57edcf2eb4560a1cf72d490f1c31e043f4
parent 7ba59c35596bd53ebc9b5bed40b2d7bd2e5ac94d
parent a05df455e81909e97c8ab869f5528c32e17ae59e

Merge "Fix a possible race condition in SensorManager initialization." into mnc-dr-dev

core/java/android/hardware/SystemSensorManager.java

diff --git a/core/java/android/hardware/SystemSensorManager.java b/core/java/android/hardware/SystemSensorManager.java
index 30cdfd3..2fe8fb6 100644
--- a/core/java/android/hardware/SystemSensorManager.java
+++ b/core/java/android/hardware/SystemSensorManager.java
@@ -78,14 +78,14 @@
                 sSensorModuleInitialized = true;
                 nativeClassInit();
             }
-        }
 
-        // initialize the sensor list
-        for (int index = 0;;++index) {
-            Sensor sensor = new Sensor();
-            if (!nativeGetSensorAtIndex(mNativeInstance, sensor, index)) break;
-            mFullSensorsList.add(sensor);
-            mHandleToSensor.append(sensor.getHandle(), sensor);
+            // initialize the sensor list
+            for (int index = 0;;++index) {
+                Sensor sensor = new Sensor();
+                if (!nativeGetSensorAtIndex(mNativeInstance, sensor, index)) break;
+                mFullSensorsList.add(sensor);
+                mHandleToSensor.append(sensor.getHandle(), sensor);
+            }
         }
     }