| commit | 662285d4284b67d2a161a67d0252056b93270cfd | [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 | 998c39e6faba06dbe00fe199563dae6c2de399dc | |
| parent | 7663d1760d027eb5ee40fe79fd6ed6c6385f4b7c [diff] | |
| parent | b91719b526275187b319a49f9b8c1869b5243daa [diff] |
Merge "Do not deduce VCN capability if Builder is derived from request" am: ed05115dca am: b91719b526 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; } /**