Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bca026c1 authored by Tom Hsu's avatar Tom Hsu Committed by Automerger Merge Worker
Browse files

Merge "Settings: Fix force close for telephony callback exceeding limitation"... 

Merge "Settings: Fix force close for telephony callback exceeding limitation" into main am: 380a136e

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2995004



Change-Id: I66c3770935276a233374b1a6ab8bc23d80c64100
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 47177e04 380a136e

src/com/android/settings/network/MobileNetworkRepository.java

+5 −1
Original line number Diff line number Diff line
@@ -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