diff options
author | ellen,yang <ellen.yang@unisoc.com> | 2023-08-24 14:49:19 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-08-24 14:49:19 +0000 |
commit | 0936338eb7d717bd75a1c50f8632afefb55103d6 (patch) | |
tree | cdfdec510b7b431b4dccfafe6461a844a58577b9 | |
parent | 5bb65457150a78269702a09c8ed639da333ae2b5 (diff) | |
parent | 6fc6d5a28f2c0561f3f3018e33a950f9ce54153c (diff) | |
download | connectedappssdk-0936338eb7d717bd75a1c50f8632afefb55103d6.tar.gz |
modify the concurrentmodificationexception in the senfers in CrossprofileSenders.java am: 2067f2a646 am: 6fc6d5a28f
Original change: https://android-review.googlesource.com/c/platform/external/connectedappssdk/+/2714934
Change-Id: I6d766f959b7861236a17d1417eb5630265b62a35
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); + } } } }; |