LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace clearAll with withoutDefaultCapabilities in NC#Builder am: bbd8b43c93

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1708167

Change-Id: Ibfd7bab3186ebde177e968ba86962655bee49841
This commit is contained in:
Chiachang Wang
2021-05-17 02:29:35 +00:00
committed by Automerger Merge Worker
parent c284d8c380 bbd8b43c93
commit 4bd34bdfba
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
View File

@@ -167,8 +167,8 @@ public class EthernetNetworkFactory extends NetworkFactory {
} }
private void updateCapabilityFilter() { private void updateCapabilityFilter() {
NetworkCapabilities capabilitiesFilter = new NetworkCapabilities.Builder() NetworkCapabilities capabilitiesFilter =
.clearAll() NetworkCapabilities.Builder.withoutDefaultCapabilities()
.addTransportType(NetworkCapabilities.TRANSPORT_ETHERNET) .addTransportType(NetworkCapabilities.TRANSPORT_ETHERNET)
.build(); .build();

7
service-t/src/com/android/server/ethernet/EthernetTracker.java
View File

@@ -507,10 +507,9 @@ final class EthernetTracker {
boolean clearDefaultCapabilities, @Nullable String commaSeparatedCapabilities, boolean clearDefaultCapabilities, @Nullable String commaSeparatedCapabilities,
@Nullable String overrideTransport) { @Nullable String overrideTransport) {
final NetworkCapabilities.Builder builder = new NetworkCapabilities.Builder(); final NetworkCapabilities.Builder builder = clearDefaultCapabilities
if (clearDefaultCapabilities) { ? NetworkCapabilities.Builder.withoutDefaultCapabilities()
builder.clearAll(); // Remove default capabilities and transports : new NetworkCapabilities.Builder();
}
// Determine the transport type. If someone has tried to define an override transport then // Determine the transport type. If someone has tried to define an override transport then
// attempt to add it. Since we can only have one override, all errors with it will // attempt to add it. Since we can only have one override, all errors with it will

2
tests/ethernet/java/com/android/server/ethernet/EthernetTrackerTest.java
View File

@@ -107,7 +107,7 @@ public class EthernetTrackerTest {
private NetworkCapabilities.Builder makeEthernetCapabilitiesBuilder(boolean clearAll) { private NetworkCapabilities.Builder makeEthernetCapabilitiesBuilder(boolean clearAll) {
final NetworkCapabilities.Builder builder = final NetworkCapabilities.Builder builder =
clearAll ? new NetworkCapabilities.Builder().clearAll() clearAll ? NetworkCapabilities.Builder.withoutDefaultCapabilities()
: new NetworkCapabilities.Builder(); : new NetworkCapabilities.Builder();
return builder.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING) return builder.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING)
.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_CONGESTED) .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_CONGESTED)