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

Commit 3291cb3f authored by Ling Ma's avatar Ling Ma
Browse files

Trivial fix 

the pending switch phone Id should be cleaned up immediate switch.

Flag: EXEMPT trivial
Test: manual verified
Test: basic voice call + data browsing
Change-Id: I7d62b8b388371a6e858d3088c3d18464429cfcda
parent 0fb60746

src/java/com/android/internal/telephony/data/AutoDataSwitchController.java

+2 −0
Original line number Diff line number Diff line
@@ -684,6 +684,7 @@ public class AutoDataSwitchController extends Handler { 


            DataEvaluation internetEvaluation;

            if (!defaultDataPhone.isUserDataEnabled()) {

                mSelectedTargetPhoneId = INVALID_PHONE_INDEX;

                mPhoneSwitcherCallback.onRequireImmediatelySwitchToPhone(DEFAULT_PHONE_INDEX,

                        EVALUATION_REASON_DATA_SETTINGS_CHANGED);

                log(debugMessage.append(
@@ -692,6 +693,7 @@ public class AutoDataSwitchController extends Handler { 
            } else if (!(internetEvaluation = backupDataPhone.getDataNetworkController()

                    .getInternetEvaluation(false/*ignoreExistingNetworks*/))

                    .isSubsetOf(DataEvaluation.DataDisallowedReason.NOT_IN_SERVICE)) {

                mSelectedTargetPhoneId = INVALID_PHONE_INDEX;

                mPhoneSwitcherCallback.onRequireImmediatelySwitchToPhone(

                        DEFAULT_PHONE_INDEX, EVALUATION_REASON_DATA_SETTINGS_CHANGED);

                log(debugMessage.append(