| commit | 7d6e4fb193c8b6dc70d3df6b17350a36e858832c | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Apr 21 15:21:59 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 21 15:21:59 2021 +0000 |
| tree | 4e510e7f52c33409f386c22c5c628e6543f2658e | |
| parent | 9eea7b3d09d0a7ffbf8c420a3e352f86e47be4ca [diff] | |
| parent | 662285d4284b67d2a161a67d0252056b93270cfd [diff] |
Merge "Do not deduce VCN capability if Builder is derived from request" am: ed05115dca am: b91719b526 am: 662285d428 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1683015 Change-Id: I6ecdb60e530807c8a93f2709784cf1b5814a2178
diff --git a/framework/src/android/net/NetworkRequest.java b/framework/src/android/net/NetworkRequest.java index 90aac0e..194b8ff 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; } /**