PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I1ec067ca7807a25adcb03287cafe1b4b4210b23a
This commit is contained in:
Chiachang Wang
2021-05-14 10:03:41 +00:00
committed by Automerger Merge Worker
parent 3fc655482f e5d4adc69e
commit 27130d5ce9
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java
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;

3
tests/robotests/src/com/android/settings/wifi/slice/ContextualWifiSliceTest.java
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();