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

Create a builder for NetworkCapabilities. am: db3d568139

Browse Source 
Change-Id: Ifbc4fae6c55abfb5aa233cf9bc57f5e14f9b583c
This commit is contained in:
Chalard Jean
2020-03-20 11:08:59 +00:00
committed by Automerger Merge Worker
parent 07bb07217a db3d568139
commit 93a644a555
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Tethering/src/com/android/server/connectivity/tethering/UpstreamNetworkMonitor.java
View File

@@ -586,21 +586,21 @@ public class UpstreamNetworkMonitor {
*/ */
@VisibleForTesting @VisibleForTesting
public static NetworkCapabilities networkCapabilitiesForType(int type) { public static NetworkCapabilities networkCapabilitiesForType(int type) {
final NetworkCapabilities nc = new NetworkCapabilities(); final NetworkCapabilities.Builder builder = new NetworkCapabilities.Builder();
// Map from type to transports. // Map from type to transports.
final int notFound = -1; final int notFound = -1;
final int transport = sLegacyTypeToTransport.get(type, notFound); final int transport = sLegacyTypeToTransport.get(type, notFound);
Preconditions.checkArgument(transport != notFound, "unknown legacy type: " + type); Preconditions.checkArgument(transport != notFound, "unknown legacy type: " + type);
nc.addTransportType(transport); builder.addTransportType(transport);
if (type == TYPE_MOBILE_DUN) { 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. // DUN is restricted network, see NetworkCapabilities#FORCE_RESTRICTED_CAPABILITIES.
nc.removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED); builder.removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED);
} else { } else {
nc.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET); builder.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);
} }
return nc; return builder.build();
} }
} }