commit 9098a0260f43e89165783089e025f5fd51da78f3
author Peng Xu <pengxu@google.com> Tue Apr 25 17:51:20 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 25 17:51:26 2017 +0000
tree d245d38df7754e8a7080dc52995cea73287f26d1
parent a54b89e0007ffce1548ccdda24c16795b738bcfb
parent 1ff9e7ae00cf4af2eb5170b96471dda5a8211832

Merge "sensors: fix concurrent modification exception" into oc-dev

core/java/android/hardware/SystemSensorManager.java

diff --git a/core/java/android/hardware/SystemSensorManager.java b/core/java/android/hardware/SystemSensorManager.java
index 10c4cb3..f5ad5cc 100644
--- a/core/java/android/hardware/SystemSensorManager.java
+++ b/core/java/android/hardware/SystemSensorManager.java
@@ -322,7 +322,10 @@
 
         if (sensor.getReportingMode() == Sensor.REPORTING_MODE_ONE_SHOT) {
             synchronized(mTriggerListeners) {
-                for (TriggerEventListener l: mTriggerListeners.keySet()) {
+                HashMap<TriggerEventListener, TriggerEventQueue> triggerListeners =
+                    new HashMap<TriggerEventListener, TriggerEventQueue>(mTriggerListeners);
+
+                for (TriggerEventListener l: triggerListeners.keySet()) {
                     if (DEBUG_DYNAMIC_SENSOR){
                         Log.i(TAG, "removed trigger listener" + l.toString() +
                                    " due to sensor disconnection");
@@ -332,7 +335,10 @@
             }
         } else {
             synchronized(mSensorListeners) {
-                for (SensorEventListener l: mSensorListeners.keySet()) {
+                HashMap<SensorEventListener, SensorEventQueue> sensorListeners =
+                    new HashMap<SensorEventListener, SensorEventQueue>(mSensorListeners);
+
+                for (SensorEventListener l: sensorListeners.keySet()) {
                     if (DEBUG_DYNAMIC_SENSOR){
                         Log.i(TAG, "removed event listener" + l.toString() +
                                    " due to sensor disconnection");