Merge "Specify CAPABILITY_INTERNET for ConnDiags CTS test." am: 74bfd2d74c am: 831119c176 am: f9d0f0d9c1
Original change: https://android-review.googlesource.com/c/platform/cts/+/1416372 Change-Id: If29d04fa610b49d02d1b6e2896da8a0e3550c5e5
This commit is contained in:
@@ -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_METRICS_COLLECTION_PERIOD_MILLIS;
|
||||||
import static android.net.ConnectivityDiagnosticsManager.DataStallReport.KEY_TCP_PACKET_FAIL_RATE;
|
import static android.net.ConnectivityDiagnosticsManager.DataStallReport.KEY_TCP_PACKET_FAIL_RATE;
|
||||||
import static android.net.ConnectivityDiagnosticsManager.persistableBundleEquals;
|
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_NOT_VPN;
|
||||||
import static android.net.NetworkCapabilities.NET_CAPABILITY_TRUSTED;
|
import static android.net.NetworkCapabilities.NET_CAPABILITY_TRUSTED;
|
||||||
import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR;
|
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 String SHA_256 = "SHA-256";
|
||||||
|
|
||||||
private static final NetworkRequest CELLULAR_NETWORK_REQUEST =
|
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();
|
private static final IBinder BINDER = new Binder();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user