Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22edbef1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I19da4ae952b5d412b429aa291868e8e7980ad5fd
parents 10e844df 4f6c13a4
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -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;
        }

        /**