Merge "Specify CAPABILITY_INTERNET for ConnDiags CTS test." am: 74bfd2d74c am: 831119c176 am: f9d0f0d9c1 am: 6b63484f76

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

Change-Id: Ic59616f8f6f89f445ecde917f391bdee2672ef5e
This commit is contained in:
Treehugger Robot
2020-09-01 07:43:02 +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();