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

Commit cddbcb98 authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by android-build-merger
Browse files

Merge "Changing setPreferredData so that it takes subId." 

am: 732aecd8

Change-Id: Ib9ddce4b5ce02f9e301c4f52ac1e6dffe207014c
parents c67939a3 732aecd8

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

+1 −4
Original line number Diff line number Diff line
@@ -2293,14 +2293,11 @@ public class SubscriptionController extends ISub.Stub { 
    }



    @Override

    public int setPreferredData(int slotId) {

    public int setPreferredData(int subId) {

        enforceModifyPhoneState("setPreferredData");

        final long token = Binder.clearCallingIdentity();



        try {

            // TODO: make this API takes in subId directly.

            int subId = getSubIdUsingPhoneId(slotId);



            if (mPreferredDataSubId != subId) {

                mPreferredDataSubId = subId;

                PhoneSwitcher.getInstance().setPreferredData(subId);