commit cc8c5c8600304e8aeedf8b84a2b7e2d55604bdcf
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Mar 21 03:35:00 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 21 03:35:00 2024 +0000
tree 392b370339b69a18cde9fa3ad9136bafdce95c03
parent 88feeec3c1efbddd65ceabc9363c391e544cd0c3
parent 55899976e95d22d892eebffadd19dfbbe29e6490

Merge "Fix concurrent issue" into main

src/com/android/settings/network/MobileNetworkRepository.java

diff --git a/src/com/android/settings/network/MobileNetworkRepository.java b/src/com/android/settings/network/MobileNetworkRepository.java
index b0c85fc..381f3c1 100644
--- a/src/com/android/settings/network/MobileNetworkRepository.java
+++ b/src/com/android/settings/network/MobileNetworkRepository.java
@@ -295,7 +295,9 @@
     }
 
     public void removeRegister(MobileNetworkCallback mobileNetworkCallback) {
-        sCallbacks.remove(mobileNetworkCallback);
+        synchronized (this) {
+            sCallbacks.remove(mobileNetworkCallback);
+        }
         if (sCallbacks.isEmpty()) {
             mSubscriptionManager.removeOnSubscriptionsChangedListener(this);
             mAirplaneModeObserver.unRegister(mContext);