Merge "Replace clearAll with withoutDefaultCapabilities" into sc-dev am: 5613be1465

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14518468

Change-Id: I2a61d88bc97d4a26d10b58a80f2ea4ac90b84a5f
This commit is contained in:
Chiachang Wang
2021-05-14 09:36:55 +00:00
committed by Automerger Merge Worker
2 changed files with 2 additions and 4 deletions

View File

@@ -1048,8 +1048,7 @@ public class WifiDetailPreferenceController2Test {
}
private NetworkCapabilities makeNetworkCapabilities() {
final NetworkCapabilities nc = new NetworkCapabilities.Builder()
.clearAll()
final NetworkCapabilities nc = NetworkCapabilities.Builder.withoutDefaultCapabilities()
.addTransportType(NetworkCapabilities.TRANSPORT_WIFI)
.build();
return nc;

View File

@@ -144,8 +144,7 @@ public class ContextualWifiSliceTest {
}
private NetworkCapabilities makeValidatedNetworkCapabilities() {
final NetworkCapabilities nc = new NetworkCapabilities.Builder()
.clearAll()
final NetworkCapabilities nc = NetworkCapabilities.Builder.withoutDefaultCapabilities()
.addTransportType(NetworkCapabilities.TRANSPORT_WIFI)
.addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
.build();