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

Commit c3da0e72 authored by Chen Xu's avatar Chen Xu Committed by Android (Google) Code Review
Browse files

Merge "confirm default data sub active before disable data on non-default sub" into qt-dev

parents 879c0ffc 011534fd

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

+5 −0
Original line number Diff line number Diff line
@@ -300,6 +300,11 @@ public class MultiSimSettingController { 


    private void disableDataForNonDefaultNonOpportunisticSubscriptions() {

        int defaultDataSub = mSubController.getDefaultDataSubId();

        // Only disable data for non-default subscription if default sub is active.

        if (!mSubController.isActiveSubId(defaultDataSub)) {

            log("default data sub is inactive, skip disabling data for non-default subs");

            return;

        }



        for (Phone phone : mPhones) {

            if (phone.getSubId() != defaultDataSub

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

+7 −2
Original line number Diff line number Diff line
@@ -614,8 +614,13 @@ public class SubscriptionInfoUpdater extends Handler { 
        // TODO investigate if we can update for each slot separately.

        if (isAllIccIdQueryDone()) {

            // Ensure the modems are mapped correctly

            if (mSubscriptionManager.isActiveSubId(

                    mSubscriptionManager.getDefaultDataSubscriptionId())) {

                mSubscriptionManager.setDefaultDataSubId(

                        mSubscriptionManager.getDefaultDataSubscriptionId());

            } else {

                logd("bypass reset default data sub if inactive");

            }

            UiccController uiccController = UiccController.getInstance();

            UiccSlot[] uiccSlots = uiccController.getUiccSlots();

            if (uiccSlots != null) {