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

Merge "Do not deduce VCN capability if Builder is derived from request" am: ed05115dca

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1683015

Change-Id: I19da4ae952b5d412b429aa291868e8e7980ad5fd
This commit is contained in:
Treehugger Robot
2021-04-21 14:29:33 +00:00
committed by Automerger Merge Worker
parent db0c8c32b1 ed05115dca
commit b91719b526
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/src/android/net/NetworkRequest.java
View File

@@ -220,6 +220,10 @@ public class NetworkRequest implements Parcelable {
public Builder(@NonNull final NetworkRequest request) { public Builder(@NonNull final NetworkRequest request) {
Objects.requireNonNull(request); Objects.requireNonNull(request);
mNetworkCapabilities = request.networkCapabilities; mNetworkCapabilities = request.networkCapabilities;
// If the caller constructed the builder from a request, it means the user
// might explicitly want the capabilities from the request. Thus, the NOT_VCN_MANAGED
// capabilities should not be touched later.
mModifiedNotVcnManaged = true;
} }
/** /**