commit 55899976e95d22d892eebffadd19dfbbe29e6490
author tomhsu <tomhsu@google.com> Wed Mar 20 08:29:43 2024 +0000
committer tomhsu <tomhsu@google.com> Wed Mar 20 08:29:43 2024 +0000
tree fcaa2b5a29471348f096ee8ce62ac41569862c04
parent cc10abe1c29092a6111d83c97224a9bfbf75c2f5

Fix concurrent issue

 - Add a thread lock

Fix: 286495550
Test: make pass
Change-Id: I72877551bda18cf93734d270770a0bd53bab465b

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);