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

Commit f75ae222 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:... 

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

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

Change-Id: I6ecdb60e530807c8a93f2709784cf1b5814a2178
parents 16472322 807284da

packages/Connectivity/framework/src/android/net/NetworkRequest.java

+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;

        }



        /**