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

Commit 837fbbde authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Add NetworkRequest.Builder creating from an existing instance" into sc-dev am: 6537da5e 

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

Change-Id: I33e19413c0390732608dd1e8a7f4437e7be0cc6f
parents ddd29bcb 6537da5e

packages/Connectivity/framework/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -396,6 +396,7 @@ package android.net { 


  public static class NetworkRequest.Builder {

    ctor public NetworkRequest.Builder();

    ctor public NetworkRequest.Builder(@NonNull android.net.NetworkRequest);

    method public android.net.NetworkRequest.Builder addCapability(int);

    method public android.net.NetworkRequest.Builder addTransportType(int);

    method public android.net.NetworkRequest build();

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

+8 −0
Original line number Diff line number Diff line
@@ -215,6 +215,14 @@ public class NetworkRequest implements Parcelable { 
            mNetworkCapabilities.setSingleUid(Process.myUid());

        }



        /**

         * Creates a new Builder of NetworkRequest from an existing instance.

         */

        public Builder(@NonNull final NetworkRequest request) {

            Objects.requireNonNull(request);

            mNetworkCapabilities = request.networkCapabilities;

        }



        /**

         * Build {@link NetworkRequest} give the current set of capabilities.

         */