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

Commit cb3ad0c6 authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

Merge "Fix issue with syncing default voice sub with Telecom." into qt-dev 

am: 86cf4150

Change-Id: I954dc11dee8dc2108ab903f949df54ea899c32d2
parents 2fad7a11 86cf4150

src/java/com/android/internal/telephony/SubscriptionController.java

+11 −16
Original line number Diff line number Diff line
@@ -2099,16 +2099,12 @@ public class SubscriptionController extends ISub.Stub { 
        }

        if (DBG) logdl("[setDefaultVoiceSubId] subId=" + subId);



        int previousSetting = Settings.Global.getInt(mContext.getContentResolver(),

                Settings.Global.MULTI_SIM_VOICE_CALL_SUBSCRIPTION,

                SubscriptionManager.DEFAULT_SUBSCRIPTION_ID);

        int previousDefaultSub = getDefaultSubId();



        Settings.Global.putInt(mContext.getContentResolver(),

                Settings.Global.MULTI_SIM_VOICE_CALL_SUBSCRIPTION, subId);

        broadcastDefaultVoiceSubIdChanged(subId);



        if (previousSetting != subId) {

        PhoneAccountHandle newHandle =

                subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID

                        ? null : mTelephonyManager.getPhoneAccountHandleForSubscriptionId(
@@ -2123,7 +2119,6 @@ public class SubscriptionController extends ISub.Stub { 
        } else {

            logd("[setDefaultVoiceSubId] default phone account not changed");

        }

        }



        if (previousDefaultSub != getDefaultSubId()) {

            sendDefaultChangedBroadcast(getDefaultSubId());