From 69286a3791e95933bf13beef1747e1741a1f4dfd Mon Sep 17 00:00:00 2001 From: Chalard Jean Date: Wed, 18 Mar 2020 15:58:50 +0900 Subject: [PATCH] Create a builder for NetworkCapabilities. Bug: 151322799 Test: FrameworksWifiTests Change-Id: I69c00c9e3963950e55d7105d8825f7d3a3ec9b2f Merged-In: I06eb97e50d5583579b3c26d1365d2dbaec8bfc99 (cherry picked from commit 9771f34dae9cdeb857636cac2b3c2d473713914e) --- .../tethering/UpstreamNetworkMonitor.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Tethering/src/com/android/server/connectivity/tethering/UpstreamNetworkMonitor.java b/Tethering/src/com/android/server/connectivity/tethering/UpstreamNetworkMonitor.java index 7ac7f5f06e..45bb4ab6e5 100644 --- a/Tethering/src/com/android/server/connectivity/tethering/UpstreamNetworkMonitor.java +++ b/Tethering/src/com/android/server/connectivity/tethering/UpstreamNetworkMonitor.java @@ -586,21 +586,21 @@ public class UpstreamNetworkMonitor { */ @VisibleForTesting public static NetworkCapabilities networkCapabilitiesForType(int type) { - final NetworkCapabilities nc = new NetworkCapabilities(); + final NetworkCapabilities.Builder builder = new NetworkCapabilities.Builder(); // Map from type to transports. final int notFound = -1; final int transport = sLegacyTypeToTransport.get(type, notFound); Preconditions.checkArgument(transport != notFound, "unknown legacy type: " + type); - nc.addTransportType(transport); + builder.addTransportType(transport); if (type == TYPE_MOBILE_DUN) { - nc.addCapability(NetworkCapabilities.NET_CAPABILITY_DUN); + builder.addCapability(NetworkCapabilities.NET_CAPABILITY_DUN); // DUN is restricted network, see NetworkCapabilities#FORCE_RESTRICTED_CAPABILITIES. - nc.removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED); + builder.removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED); } else { - nc.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET); + builder.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET); } - return nc; + return builder.build(); } }