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

Commit 1275047c authored by Ling Ma's avatar Ling Ma Committed by Automerger Merge Worker
Browse files

Reevaluate network requests when change from roaming to home service am: 7aa5f91f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/24149384



Change-Id: I35c3aa6b2be9df54290c8894c6dd4975df1f860e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1c3860b0 7aa5f91f

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

+2 −1
Original line number Diff line number Diff line
@@ -3435,7 +3435,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
@@ -1587,6 +1587,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