Merge "Do not deduce VCN capability if Builder is derived from request" am: 4f6c13a4c2 am: 22edbef1ca

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1683015

Change-Id: Ib6a1b690c32b25aa86d8d432ac3f3a9eb1803efa

1 files changed, 4 insertions, 0 deletions

diff --git a/packages/Connectivity/framework/src/android/net/NetworkRequest.java b/packages/Connectivity/framework/src/android/net/NetworkRequest.java
index 3a8a07a55ad4..07b6c7d5be6b 100644
--- a/packages/Connectivity/framework/src/android/net/NetworkRequest.java
+++ b/packages/Connectivity/framework/src/android/net/NetworkRequest.java
@@ -220,6 +220,10 @@ public class NetworkRequest implements Parcelable {
         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;
         }
 
         /**