Merge "AudioManager: fix event handler" into rvc-dev

media/java/android/media/AudioPortEventHandler.java

@@ -78,7 +78,8 @@ class AudioPortEventHandler {
                                     listeners.add((AudioManager.OnAudioPortUpdateListener)msg.obj);
                                 }
                             } else {
-                                listeners = mListeners;
+                                listeners = (ArrayList<AudioManager.OnAudioPortUpdateListener>)
+                                        mListeners.clone();
                             }
                         }
                         // reset audio port cache if the event corresponds to a change coming

media/java/android/media/audiopolicy/AudioVolumeGroupChangeHandler.java

@@ -80,7 +80,8 @@ public class AudioVolumeGroupChangeHandler {
                                         (AudioManager.VolumeGroupCallback) msg.obj);
                             }
                         } else {
-                            listeners = mListeners;
+                            listeners = (ArrayList<AudioManager.VolumeGroupCallback>)
+                                    mListeners.clone();
                         }
                     }
                     if (listeners.isEmpty()) {