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

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

Remove usage of hidden Connectivity APIs 

This removes one use of NetworkRequest.requestId, and the usage of the
NetCapability intdef

Bug: 170598012
Test: atest FrameworksVcnTests
Change-Id: I6b688b008721bc9f5cb1435f2e7096277a12dc45
parent 58467f3f

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

+1 −2
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.net.ConnectivityManager.NetworkCallback; 
import android.net.LinkProperties;

import android.net.Network;

import android.net.NetworkCapabilities;

import android.net.NetworkCapabilities.NetCapability;

import android.net.NetworkRequest;

import android.net.TelephonyNetworkSpecifier;

import android.os.Handler;
@@ -133,7 +132,7 @@ public class UnderlyingNetworkTracker { 


    private NetworkRequest.Builder getNetworkRequestBase() {

        NetworkRequest.Builder requestBase = new NetworkRequest.Builder();

        for (@NetCapability int capability : mRequiredUnderlyingNetworkCapabilities) {

        for (int capability : mRequiredUnderlyingNetworkCapabilities) {

            requestBase.addCapability(capability);

        }

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

+1 −3
Original line number Diff line number Diff line
@@ -291,9 +291,7 @@ public class Vcn extends Handler { 
        for (VcnGatewayConnectionConfig gatewayConnectionConfig :

                mConfig.getGatewayConnectionConfigs()) {

            if (isRequestSatisfiedByGatewayConnectionConfig(request, gatewayConnectionConfig)) {

                Slog.v(

                        getLogTag(),

                        "Bringing up new VcnGatewayConnection for request " + request.requestId);

                Slog.v(getLogTag(), "Bringing up new VcnGatewayConnection for request " + request);



                final VcnGatewayConnection vcnGatewayConnection =

                        mDeps.newVcnGatewayConnection(