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

Commit e9c37e35 authored by Tyler Gunn's avatar Tyler Gunn
Browse files

Fix issue with syncing default voice sub with Telecom. 

When setting the default voice sub ID we would not try to set the phone
account in Telecom if the subid setting didn't change.  There are some
instances we've seen in the field where the sub ID is set (but not changed)
and Telecom needs to update the default outgoing phone account.

Since the code alread checks to see if the phone account did change, we
remove the check for setting equality and always try to update telecom
here intead.

Test: Switch between single-sim and DSDS mode; confirm sync is not lost.
Bug: 134469771
Change-Id: Ieb62c46a8fd6b09eb4778ebadd81492a9c6dd234
parent 630c6b15

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());