commit 0386f0a0c37184b7dd618ac9ef897e9ec0003493
author Mark Tabry <mtab@google.com> Mon Oct 21 17:00:19 2019 -0700
committer Mark Tabry <mtab@google.com> Mon Oct 21 17:06:29 2019 -0700
tree 5a87c48c03b0a20ee9b71bec3858dc1aadae4a92
parent 65f6d21763d0c4f0919c7a671591ea0d84e9a1aa

Fix ConcurrentModificationException by locking mSubscribers access.

Bug: 142805004
Test: atest AndroidCarApiTest CarServiceTest CarServiceUnitTest
Change-Id: I084941d96c955af5f77049d3c05516fc995314a2

service/src/com/android/car/vms/VmsClientManager.java

diff --git a/service/src/com/android/car/vms/VmsClientManager.java b/service/src/com/android/car/vms/VmsClientManager.java
index a00e179..66a0fe4 100644
--- a/service/src/com/android/car/vms/VmsClientManager.java
+++ b/service/src/com/android/car/vms/VmsClientManager.java
@@ -286,9 +286,11 @@
      * Returns all active subscriber clients.
      */
     public Collection<IVmsSubscriberClient> getAllSubscribers() {
-        return mSubscribers.values().stream()
-                .map(subscriber -> subscriber.mClient)
-                .collect(Collectors.toList());
+        synchronized (mLock) {
+            return mSubscribers.values().stream()
+                    .map(subscriber -> subscriber.mClient)
+                    .collect(Collectors.toList());
+        }
     }
 
     /**