| commit | bca026c182f36177602b2465af8f3bbea50e4786 | [log] [tgz] |
|---|---|---|
| author | Tom Hsu <tomhsu@google.com> | Mon Mar 25 07:03:46 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Mar 25 07:03:46 2024 +0000 |
| tree | 53791b71f1375053bc423aeaa473ad89ed60ba6c | |
| parent | 47177e048f1d772c1d5a9492d624c4c3e2ebc50d [diff] | |
| parent | 380a136e504a0f264f25f618511cd2c3f97469a0 [diff] |
Merge "Settings: Fix force close for telephony callback exceeding limitation" into main am: 380a136e50 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2995004 Change-Id: I66c3770935276a233374b1a6ab8bc23d80c64100 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/com/android/settings/network/MobileNetworkRepository.java b/src/com/android/settings/network/MobileNetworkRepository.java index af37d24..7bc61a4 100644 --- a/src/com/android/settings/network/MobileNetworkRepository.java +++ b/src/com/android/settings/network/MobileNetworkRepository.java
@@ -245,7 +245,11 @@ } 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