diff options
| author | Tom Hsu <tomhsu@google.com> | 2024-03-25 06:49:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-03-25 06:49:08 +0000 |
| commit | 380a136e504a0f264f25f618511cd2c3f97469a0 (patch) | |
| tree | 53791b71f1375053bc423aeaa473ad89ed60ba6c | |
| parent | b83471f770b2dccf0649c9297a8a83f1c242c0b9 (diff) | |
| parent | ef2e171b50accf39ab5fd8647c4aea4413e456ed (diff) | |
| download | Settings-380a136e504a0f264f25f618511cd2c3f97469a0.tar.gz | |
Merge "Settings: Fix force close for telephony callback exceeding limitation" into main
| -rw-r--r-- | src/com/android/settings/network/MobileNetworkRepository.java | 6 |
1 files changed, 5 insertions, 1 deletions
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 |