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

Commit 60103ee4 authored by Cody Kesting's avatar Cody Kesting Committed by Automerger Merge Worker
Browse files

Merge changes I4b135749,If4fcaa52 am: 576dad46 am: cd4e6ae6 am: 5cdc27d2... 

Merge changes I4b135749,If4fcaa52 am: 576dad46 am: cd4e6ae6 am: 5cdc27d2 am: be6088d1 am: eee5d160

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

Change-Id: Id06b6404a3113ce959fc22d3e2e66323c0b39518
parents 9a77e732 eee5d160

services/core/java/com/android/server/VcnManagementService.java

+2 −2
Original line number Diff line number Diff line
@@ -335,8 +335,8 @@ public class VcnManagementService extends IVcnManagementService.Stub { 
                @NonNull Context context,

                @NonNull Looper looper,

                @NonNull VcnNetworkProvider vcnNetworkProvider,

                boolean getIsInTestMode) {

            return new VcnContext(context, looper, vcnNetworkProvider, getIsInTestMode);

                boolean isInTestMode) {

            return new VcnContext(context, looper, vcnNetworkProvider, isInTestMode);

        }



        /** Creates a new Vcn instance using the provided configuration */

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

+2 −3
Original line number Diff line number Diff line
@@ -219,10 +219,9 @@ public class UnderlyingNetworkTracker { 


    /** Builds and returns a NetworkRequest for the given subIds to match Test Networks. */

    private NetworkRequest getTestNetworkRequest(@NonNull Set<Integer> subIds) {

        return getBaseNetworkRequestBuilder()

        return new NetworkRequest.Builder()

                .clearCapabilities()

                .addTransportType(NetworkCapabilities.TRANSPORT_TEST)

                .removeCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)

                .removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)

                .setSubscriptionIds(subIds)

                .build();

    }

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

+16 −19
Original line number Diff line number Diff line
@@ -163,27 +163,30 @@ public class UnderlyingNetworkTrackerTest { 


    @Test

    public void testNetworkCallbacksRegisteredOnStartupForTestMode() {

        resetVcnContext();

        when(mVcnContext.isInTestMode()).thenReturn(true);

        reset(mConnectivityManager);

        final VcnContext vcnContext =

                spy(

                        new VcnContext(

                                mContext,

                                mTestLooper.getLooper(),

                                mVcnNetworkProvider,

                                true /* isInTestMode */));



        mUnderlyingNetworkTracker =

                new UnderlyingNetworkTracker(

                        mVcnContext,

                        vcnContext,

                        SUB_GROUP,

                        mSubscriptionSnapshot,

                        Collections.singleton(NetworkCapabilities.NET_CAPABILITY_INTERNET),

                        mNetworkTrackerCb);



        verifyNetworkRequestsRegistered(INITIAL_SUB_IDS, true /* expectTestMode */);

        verify(mConnectivityManager)

                .requestBackgroundNetwork(

                        eq(getTestNetworkRequest(INITIAL_SUB_IDS)),

                        any(RouteSelectionCallback.class),

                        any());

    }



    private void verifyNetworkRequestsRegistered(Set<Integer> expectedSubIds) {

        verifyNetworkRequestsRegistered(expectedSubIds, false /* expectTestMode */);

    }



    private void verifyNetworkRequestsRegistered(

            Set<Integer> expectedSubIds, boolean expectTestMode) {

        verify(mConnectivityManager)

                .requestBackgroundNetwork(

                        eq(getWifiRequest(expectedSubIds)),
@@ -196,14 +199,9 @@ public class UnderlyingNetworkTrackerTest { 
                            any(NetworkBringupCallback.class), any());

        }



        final NetworkRequest expectedRouteSelectionRequest =

                expectTestMode

                        ? getTestNetworkRequest(expectedSubIds)

                        : getRouteSelectionRequest(expectedSubIds);



        verify(mConnectivityManager)

                .requestBackgroundNetwork(

                        eq(expectedRouteSelectionRequest),

                        eq(getRouteSelectionRequest(expectedSubIds)),

                        any(RouteSelectionCallback.class),

                        any());

    }
@@ -245,10 +243,9 @@ public class UnderlyingNetworkTrackerTest { 
    }



    private NetworkRequest getTestNetworkRequest(Set<Integer> netCapsSubIds) {

        return getExpectedRequestBase()

        return new NetworkRequest.Builder()

                .clearCapabilities()

                .addTransportType(NetworkCapabilities.TRANSPORT_TEST)

                .removeCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)

                .removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)

                .setSubscriptionIds(netCapsSubIds)

                .build();

    }