| commit | b91719b526275187b319a49f9b8c1869b5243daa | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Apr 21 14:29:33 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 21 14:29:33 2021 +0000 |
| tree | 998c39e6faba06dbe00fe199563dae6c2de399dc | |
| parent | db0c8c32b11baf035a747d4577ce3e65de5e109f [diff] | |
| parent | ed05115dca2c173700a004256a043150e9e6efec [diff] |
Merge "Do not deduce VCN capability if Builder is derived from request" am: ed05115dca Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1683015 Change-Id: I19da4ae952b5d412b429aa291868e8e7980ad5fd
diff --git a/framework/src/android/net/NetworkRequest.java b/framework/src/android/net/NetworkRequest.java index 3a8a07a..07b6c7d 100644 --- a/framework/src/android/net/NetworkRequest.java +++ b/framework/src/android/net/NetworkRequest.java
@@ -220,6 +220,10 @@ public Builder(@NonNull final NetworkRequest request) { Objects.requireNonNull(request); 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; } /**