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

Commit d9278a80 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update Mobile Data State on subscription changes." into sc-dev am: c9d80664 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15026797

Change-Id: Id9e331da1ee8d0450fbcb2beaf4b35a6ca427c54
parents fa5bd37a c9d80664

services/core/java/com/android/server/vcn/Vcn.java

+4 −0
Original line number Diff line number Diff line
@@ -453,6 +453,10 @@ public class Vcn extends Handler { 
        for (VcnGatewayConnection gatewayConnection : mVcnGatewayConnections.values()) {

            gatewayConnection.updateSubscriptionSnapshot(mLastSnapshot);

        }



        // Update the mobile data state after updating the subscription snapshot as a change in

        // subIds for a subGroup may affect the mobile data state.

        handleMobileDataToggled();

    }



    private void handleMobileDataToggled() {

tests/vcn/java/com/android/server/vcn/VcnTest.java

+21 −0
Original line number Diff line number Diff line
@@ -242,6 +242,27 @@ public class VcnTest { 
        verifyUpdateSubscriptionSnapshotNotifiesGatewayConnections(VCN_STATUS_CODE_SAFE_MODE);

    }



    @Test

    public void testSubscriptionSnapshotUpdatesMobileDataState() {

        final NetworkRequestListener requestListener = verifyAndGetRequestListener();

        startVcnGatewayWithCapabilities(requestListener, TEST_CAPS[0]);



        // Expect mobile data enabled from setUp()

        assertTrue(mVcn.isMobileDataEnabled());



        final TelephonySubscriptionSnapshot updatedSnapshot =

                mock(TelephonySubscriptionSnapshot.class);

        doReturn(TEST_SUB_IDS_IN_GROUP)

                .when(updatedSnapshot)

                .getAllSubIdsInGroup(eq(TEST_SUB_GROUP));

        doReturn(false).when(mTelephonyManager).isDataEnabled();



        mVcn.updateSubscriptionSnapshot(updatedSnapshot);

        mTestLooper.dispatchAll();



        assertFalse(mVcn.isMobileDataEnabled());

    }



    private void triggerVcnRequestListeners(NetworkRequestListener requestListener) {

        for (final int[] caps : TEST_CAPS) {

            startVcnGatewayWithCapabilities(requestListener, caps);