Merge "Specify CAPABILITY_INTERNET for ConnDiags CTS test." into stage-aosp-rvc-ts-dev am: f1383c3543 am: 8c00266fb6

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/12501101

Change-Id: Ic46fb3fbfb942aca4c959fcb2e22d97735f73213
This commit is contained in:
TreeHugger Robot
2020-09-03 03:12:57 +00:00
committed by Automerger Merge Worker

View File

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