Merge "HDM: Resolve concurrent access issue - defer execution" into rvc-dev

1 files changed, 6 insertions, 1 deletions

diff --git a/service/java/com/android/server/wifi/HalDeviceManager.java b/service/java/com/android/server/wifi/HalDeviceManager.java
index e47a33efb..783c91adf 100644
--- a/service/java/com/android/server/wifi/HalDeviceManager.java
+++ b/service/java/com/android/server/wifi/HalDeviceManager.java
@@ -2087,15 +2087,20 @@ public class HalDeviceManager {
     private void dispatchAllDestroyedListeners() {
         if (VDBG) Log.d(TAG, "dispatchAllDestroyedListeners");
 
+        List<InterfaceDestroyedListenerProxy> triggerList = new ArrayList<>();
         synchronized (mLock) {
             for (InterfaceCacheEntry cacheEntry: mInterfaceInfoCache.values()) {
                 for (InterfaceDestroyedListenerProxy listener : cacheEntry.destroyedListeners) {
-                    listener.trigger();
+                    triggerList.add(listener);
                 }
                 cacheEntry.destroyedListeners.clear(); // for insurance
             }
             mInterfaceInfoCache.clear();
         }
+
+        for (InterfaceDestroyedListenerProxy listener : triggerList) {
+            listener.trigger();
+        }
     }
 
     private abstract class ListenerProxy<LISTENER>  {