Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove usage of hidden Connectivity APIs

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

Bug: 170598012
Test: atest FrameworksVcnTests
Change-Id: I6b688b008721bc9f5cb1435f2e7096277a12dc45
This commit is contained in:
Benedict Wong
2021-03-08 11:31:59 -08:00
parent 58467f3fab
commit b5244fbceb
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/vcn/UnderlyingNetworkTracker.java
View File

@@ -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);
}

4
services/core/java/com/android/server/vcn/Vcn.java
View File

@@ -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(