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>
This commit is contained in:
Tom Hsu
2024-03-25 07:03:46 +00:00
committed by Automerger Merge Worker

View File

@@ -245,7 +245,11 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions
} }
private void createTelephonyManagerBySubId(int subId) { 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; return;
} }
PhoneCallStateTelephonyCallback PhoneCallStateTelephonyCallback