Merge "Replace clearAll with withoutDefaultCapabilities" into sc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
5613be1465
@@ -1048,8 +1048,7 @@ public class WifiDetailPreferenceController2Test {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private NetworkCapabilities makeNetworkCapabilities() {
|
private NetworkCapabilities makeNetworkCapabilities() {
|
||||||
final NetworkCapabilities nc = new NetworkCapabilities.Builder()
|
final NetworkCapabilities nc = NetworkCapabilities.Builder.withoutDefaultCapabilities()
|
||||||
.clearAll()
|
|
||||||
.addTransportType(NetworkCapabilities.TRANSPORT_WIFI)
|
.addTransportType(NetworkCapabilities.TRANSPORT_WIFI)
|
||||||
.build();
|
.build();
|
||||||
return nc;
|
return nc;
|
||||||
|
@@ -144,8 +144,7 @@ public class ContextualWifiSliceTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private NetworkCapabilities makeValidatedNetworkCapabilities() {
|
private NetworkCapabilities makeValidatedNetworkCapabilities() {
|
||||||
final NetworkCapabilities nc = new NetworkCapabilities.Builder()
|
final NetworkCapabilities nc = NetworkCapabilities.Builder.withoutDefaultCapabilities()
|
||||||
.clearAll()
|
|
||||||
.addTransportType(NetworkCapabilities.TRANSPORT_WIFI)
|
.addTransportType(NetworkCapabilities.TRANSPORT_WIFI)
|
||||||
.addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
|
.addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
|
||||||
.build();
|
.build();
|
||||||
|
Reference in New Issue
Block a user