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

Commit 3f2e85a9 authored by Thomas Stuart's avatar Thomas Stuart Committed by Android (Google) Code Review
Browse files

Merge "fix Telecom out of sync w/ Telephony#defaultVoiceSubId"

parents 9016bb3b f8096e8b

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

+2 −8
Original line number Diff line number Diff line
@@ -2844,15 +2844,9 @@ public class SubscriptionController extends ISub.Stub { 
                        subId);



        TelecomManager telecomManager = mContext.getSystemService(TelecomManager.class);

        PhoneAccountHandle currentHandle = telecomManager.getUserSelectedOutgoingPhoneAccount();

        logd("[setDefaultVoiceSubId] current phoneAccountHandle=" + currentHandle);



        if (!Objects.equals(currentHandle, newHandle)) {

        telecomManager.setUserSelectedOutgoingPhoneAccount(newHandle);

            logd("[setDefaultVoiceSubId] change to phoneAccountHandle=" + newHandle);

        } else {

            logd("[setDefaultVoiceSubId] default phoneAccountHandle not changed.");

        }

        logd("[setDefaultVoiceSubId] requesting change to phoneAccountHandle=" + newHandle);



        if (previousDefaultSub != getDefaultSubId()) {

            sendDefaultChangedBroadcast(getDefaultSubId());