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

Commit de1f0c3e authored by Benedict Wong's avatar Benedict Wong
Browse files

Declare VCN exposed networks as NOT_VCN_MANAGED 

This change marks VCN-exposed networks as generic use, NOT_VCN_MANAGED
networks. This is the result of changes to the default NetworkCapability
set, where NOT_VCN_MANAGED was removed from the default capabilities.

Bug: 182212201
Test: atest FrameworksVcnTests
Change-Id: Iad296830201d7317537fac6bea53c79d4e41cae3
parent dc1efbb3

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

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_CONGESTED; 
import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED;

import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING;

import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_SUSPENDED;

import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_VCN_MANAGED;

import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR;

import static android.net.NetworkCapabilities.TRANSPORT_WIFI;

import static android.net.vcn.VcnManager.VCN_ERROR_CODE_CONFIG_ERROR;
@@ -1727,6 +1728,7 @@ public class VcnGatewayConnection extends StateMachine { 
        final NetworkCapabilities.Builder builder = new NetworkCapabilities.Builder();



        builder.addTransportType(TRANSPORT_CELLULAR);

        builder.addCapability(NET_CAPABILITY_NOT_VCN_MANAGED);

        builder.addCapability(NET_CAPABILITY_NOT_CONGESTED);

        builder.addCapability(NET_CAPABILITY_NOT_SUSPENDED);

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

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.server.vcn; 


import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED;

import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING;

import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_VCN_MANAGED;

import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR;

import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
@@ -87,6 +88,7 @@ public class VcnGatewayConnectionTest extends VcnGatewayConnectionTestBase { 
    private void verifyBuildNetworkCapabilitiesCommon(int transportType) {

        final NetworkCapabilities underlyingCaps = new NetworkCapabilities();

        underlyingCaps.addTransportType(transportType);

        underlyingCaps.addCapability(NET_CAPABILITY_NOT_VCN_MANAGED);

        underlyingCaps.addCapability(NET_CAPABILITY_NOT_METERED);

        underlyingCaps.addCapability(NET_CAPABILITY_NOT_ROAMING);