| commit | 6a28f1cf90970c276988b9d6d6097f2027d752b7 | [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 | 7d131188dea5690c78e5469f71f81dd4fd58b601 | |
| parent | 1d3726a35ee295eabab0830f5593b2bf078806e7 [diff] | |
| parent | 053dfc191db95957ab6921ceeaecc5af5a8e9ce9 [diff] |
Merge "Do not deduce VCN capability if Builder is derived from request" am: b808656439 am: d6d2cfa107 am: 053dfc191d 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; } /**