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

Commit 134c10d9 authored by Benedict Wong's avatar Benedict Wong
Browse files

Add TRANSPORT_CELLULAR to VCN filter 

This change adds the CELLULAR transport to the filter used by the Vcn to
determine if a configuration can satisfy a given NetworkRequest

Bug: 184101137
Test: atest FrameworksVcnTests
Change-Id: I7df3f14b5ef66551728b398fd4a9e233d1df4706
parent 80056e83

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

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



import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_VCN_MANAGED;

import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR;

import static android.net.vcn.VcnManager.VCN_STATUS_CODE_ACTIVE;

import static android.net.vcn.VcnManager.VCN_STATUS_CODE_INACTIVE;

import static android.net.vcn.VcnManager.VCN_STATUS_CODE_SAFE_MODE;
@@ -395,6 +396,7 @@ public class Vcn extends Handler { 
    private boolean isRequestSatisfiedByGatewayConnectionConfig(

            @NonNull NetworkRequest request, @NonNull VcnGatewayConnectionConfig config) {

        final NetworkCapabilities.Builder builder = new NetworkCapabilities.Builder();

        builder.addTransportType(TRANSPORT_CELLULAR);

        builder.addCapability(NET_CAPABILITY_NOT_VCN_MANAGED);

        for (int cap : config.getAllExposedCapabilities()) {

            builder.addCapability(cap);

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

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.server.vcn; 
import static android.net.NetworkCapabilities.NET_CAPABILITY_DUN;

import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET;

import static android.net.NetworkCapabilities.NET_CAPABILITY_MMS;

import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR;

import static android.net.vcn.VcnManager.VCN_STATUS_CODE_ACTIVE;

import static android.net.vcn.VcnManager.VCN_STATUS_CODE_SAFE_MODE;
@@ -133,6 +134,7 @@ public class VcnTest { 
    private void startVcnGatewayWithCapabilities(

            NetworkRequestListener requestListener, int... netCapabilities) {

        final NetworkRequest.Builder requestBuilder = new NetworkRequest.Builder();

        requestBuilder.addTransportType(TRANSPORT_CELLULAR);

        for (final int netCapability : netCapabilities) {

            requestBuilder.addCapability(netCapability);

        }