| commit | 053dfc191db95957ab6921ceeaecc5af5a8e9ce9 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Apr 21 14:57:42 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 21 14:57:42 2021 +0000 |
| tree | 738f7ed2e124c10e608c86c669c9fc33e61c0fed | |
| parent | c3286a8cc66d95f9ef65f86c13a1e22c636ca761 [diff] | |
| parent | d6d2cfa107e6c917e16241549ccfe787addc04c1 [diff] |
Merge "Do not deduce VCN capability if Builder is derived from request" am: b808656439 am: d6d2cfa107 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1683015 Change-Id: Ib6a1b690c32b25aa86d8d432ac3f3a9eb1803efa
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; } /**