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

Commit a145cd47 authored by fionaxu's avatar fionaxu
Browse files

resolve merge conflicts of 22fdeabb to oc-dr1-dev-plus-aosp 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I689984e373365aa243342aa2d5e9b6fbdf0aede5
parents 954ad55b 22fdeabb

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

+7 −0
Original line number Diff line number Diff line
@@ -4353,6 +4353,13 @@ public class DcTracker extends Handler { 
        if (mAllApnSettings != null && mAllApnSettings.isEmpty()) {

            cleanUpAllConnections(tearDown, Phone.REASON_APN_CHANGED);

        } else {

            int radioTech = mPhone.getServiceState().getRilDataRadioTechnology();

            if (radioTech == ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN) {

                // unknown rat is an exception for data rat change. Its only received when out of

                // service and is not applicable for apn bearer bitmask. We should bypass the check

                // of waiting apn list and keep the data connection on.

                return;

            }

            for (ApnContext apnContext : mApnContexts.values()) {

                ArrayList<ApnSetting> currentWaitingApns = apnContext.getWaitingApns();

                ArrayList<ApnSetting> waitingApns = buildWaitingApns(

tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java

+1 −2
Original line number Diff line number Diff line
@@ -1162,7 +1162,6 @@ public class DcTrackerTest extends TelephonyTest { 
        dunApn = mDct.fetchDunApn();

        assertEquals(FAKE_APN5, dunApn.apn);

    }



    // Test oos

    @Test

    @SmallTest