Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 9098a0260f

Change-Id: I0f40f8d3bd84f2b070c7d1bd99b46fb4ac08d971
This commit is contained in:
Peng Xu
2017-04-25 18:01:05 +00:00
committed by android-build-merger
parent eb161e240e 9098a0260f
commit 90c60be02f
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/hardware/SystemSensorManager.java
View File

@@ -322,7 +322,10 @@ public class SystemSensorManager extends SensorManager {
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 @@ public class SystemSensorManager extends SensorManager {
}
} 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");