From 55899976e95d22d892eebffadd19dfbbe29e6490 Mon Sep 17 00:00:00 2001
From: tomhsu <tomhsu@google.com>
Date: Wed, 20 Mar 2024 08:29:43 +0000
Subject: [PATCH] Fix concurrent issue

 - Add a thread lock

Fix: 286495550
Test: make pass
Change-Id: I72877551bda18cf93734d270770a0bd53bab465b
---
 src/com/android/settings/network/MobileNetworkRepository.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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