From ed2521af1eb10390e193b6126c1ec62fc7b8a468 Mon Sep 17 00:00:00 2001 From: Treehugger Robot Date: Tue, 1 Sep 2020 08:02:33 +0000 Subject: [PATCH] Specify CAPABILITY_INTERNET for ConnDiags CTS test. This CL updates the NetworkCapabilities used for getting a cellular data network in ConnectivityDiagnosticsManagerTest to require CAPABILITY_INTERNET. Bug: 166732795 Test: atest CtsNetTestCases Change-Id: Ia32ac00f949a2ee9319c80c25f294bfa834ad0f9 Merged-In: Ia32ac00f949a2ee9319c80c25f294bfa834ad0f9 (cherry picked from commit 67fb0cc3d4152f890012bbb4f1f91fb657b8dd55) --- .../android/net/cts/ConnectivityDiagnosticsManagerTest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/cts/net/src/android/net/cts/ConnectivityDiagnosticsManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityDiagnosticsManagerTest.java index 8f42f79382..bd56f4b771 100644 --- a/tests/cts/net/src/android/net/cts/ConnectivityDiagnosticsManagerTest.java +++ b/tests/cts/net/src/android/net/cts/ConnectivityDiagnosticsManagerTest.java @@ -30,6 +30,7 @@ import static android.net.ConnectivityDiagnosticsManager.DataStallReport.KEY_DNS import static android.net.ConnectivityDiagnosticsManager.DataStallReport.KEY_TCP_METRICS_COLLECTION_PERIOD_MILLIS; import static android.net.ConnectivityDiagnosticsManager.DataStallReport.KEY_TCP_PACKET_FAIL_RATE; import static android.net.ConnectivityDiagnosticsManager.persistableBundleEquals; +import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET; import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_VPN; import static android.net.NetworkCapabilities.NET_CAPABILITY_TRUSTED; import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR; @@ -121,7 +122,10 @@ public class ConnectivityDiagnosticsManagerTest { private static final String SHA_256 = "SHA-256"; private static final NetworkRequest CELLULAR_NETWORK_REQUEST = - new NetworkRequest.Builder().addTransportType(TRANSPORT_CELLULAR).build(); + new NetworkRequest.Builder() + .addTransportType(TRANSPORT_CELLULAR) + .addCapability(NET_CAPABILITY_INTERNET) + .build(); private static final IBinder BINDER = new Binder();