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

Commit c65b068c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Reevaluate network requests when change from roaming to home service" into udc-qpr-dev

parents 10182b01 7fb68f38

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

+2 −1
Original line number Diff line number Diff line
@@ -3404,7 +3404,8 @@ public class DataNetworkController extends Handler { 


        if (oldPsNri == null

                || oldPsNri.getAccessNetworkTechnology() != newPsNri.getAccessNetworkTechnology()

                || (!oldPsNri.isInService() && newPsNri.isInService())) {

                || (!oldPsNri.isInService() && newPsNri.isInService())

                || (oldPsNri.isRoaming() && !newPsNri.isRoaming())) {

            return true;

        }

tests/telephonytests/src/com/android/internal/telephony/data/DataNetworkControllerTest.java

+8 −0
Original line number Diff line number Diff line
@@ -1582,6 +1582,14 @@ public class DataNetworkControllerTest extends TelephonyTest { 


        // Verify data is torn down.

        verifyNoConnectedNetworkHasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);



        // Registration is back to HOME.

        serviceStateChanged(TelephonyManager.NETWORK_TYPE_LTE,

                NetworkRegistrationInfo.REGISTRATION_STATE_HOME);

        processAllFutureMessages();



        // Verify data is restored.

        verifyInternetConnected();

    }



    @Test