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

Commit 4f6c13a4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Do not deduce VCN capability if Builder is derived from request"

parents 87c254de aa2d7f53
Loading
Loading
Loading
Loading
+4 −0
Original line number Original line Diff line number Diff line
@@ -220,6 +220,10 @@ public class NetworkRequest implements Parcelable {
        public Builder(@NonNull final NetworkRequest request) {
        public Builder(@NonNull final NetworkRequest request) {
            Objects.requireNonNull(request);
            Objects.requireNonNull(request);
            mNetworkCapabilities = request.networkCapabilities;
            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;
        }
        }


        /**
        /**