diff options
author | ellen,yang <ellen.yang@unisoc.com> | 2023-08-29 11:10:14 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-08-29 11:10:14 +0000 |
commit | 59fdce4f2c77e7d7e2b60ace6a26776921e185f8 (patch) | |
tree | cdfdec510b7b431b4dccfafe6461a844a58577b9 | |
parent | 1e7205c2a88a87d7d217bdfd3dcc79d70248dd96 (diff) | |
parent | 18fc849bf343084e82c7c08f9f9c76201a137e0a (diff) | |
download | connectedappssdk-59fdce4f2c77e7d7e2b60ace6a26776921e185f8.tar.gz |
modify the concurrentmodificationexception in the senfers in CrossprofileSenders.java am: 6149d26691 am: 18fc849bf3
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/connectedappssdk/+/24537586
Change-Id: Ib3e26d31082ed18abacf549fe887903a38f1b96d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | sdk/src/main/java/com/google/android/enterprise/connectedapps/CrossProfileSender.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sdk/src/main/java/com/google/android/enterprise/connectedapps/CrossProfileSender.java b/sdk/src/main/java/com/google/android/enterprise/connectedapps/CrossProfileSender.java index 0432696..91aaadc 100644 --- a/sdk/src/main/java/com/google/android/enterprise/connectedapps/CrossProfileSender.java +++ b/sdk/src/main/java/com/google/android/enterprise/connectedapps/CrossProfileSender.java @@ -49,11 +49,13 @@ import com.google.android.enterprise.connectedapps.internal.CrossProfileBundleCa import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Set; import java.util.WeakHashMap; +import java.util.Iterator; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedDeque; import java.util.concurrent.CountDownLatch; @@ -283,13 +285,15 @@ public final class CrossProfileSender { // This is synchronized which isn't massively performant but it only gets accessed once straight // after creating a Sender, and once each time availability changes private static final Set<CrossProfileSender> senders = - synchronizedSet(newSetFromMap(new WeakHashMap<>())); + synchronizedSet(newSetFromMap(new WeakHashMap<>())); private static final BroadcastReceiver profileAvailabilityReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { - for (CrossProfileSender sender : senders) { - sender.scheduledExecutorService.execute(sender::checkAvailability); + synchronized (senders) { + for (CrossProfileSender sender : senders) { + sender.scheduledExecutorService.execute(sender::checkAvailability); + } } } }; |