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

Merge "Create a builder for NetworkCapabilities." am: b3289466c5

Browse Source 
Change-Id: I2c78de7b501edca618441040fbe76e34ce15b08e
This commit is contained in:
Remi NGUYEN VAN
2020-03-30 03:06:07 +00:00
committed by Automerger Merge Worker
parent 9cc9f6b471 b3289466c5
commit 2692eab096
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
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();
}
}