diff --git a/src/com/android/settings/network/MobileNetworkRepository.java b/src/com/android/settings/network/MobileNetworkRepository.java index af37d249c4c..7bc61a49438 100644 --- a/src/com/android/settings/network/MobileNetworkRepository.java +++ b/src/com/android/settings/network/MobileNetworkRepository.java @@ -245,7 +245,11 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions } private void createTelephonyManagerBySubId(int subId) { - if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) { + if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID + || mTelephonyCallbackMap.containsKey(subId)) { + if (DEBUG) { + Log.d(TAG, "createTelephonyManagerBySubId: directly return for subId = " + subId); + } return; } PhoneCallStateTelephonyCallback