commit 074c7d7537e9e4f2e921b9e8f94887ad7c1b71c3
author Chiachang Wang <chiachangwang@google.com> Tue Mar 23 10:46:20 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 23 10:46:20 2021 +0000
tree 4327841677d73d02eefebf4d1317754e010d55e3
parent 84ebe6693a3151ec3d89ed947658459638845fd3
parent e2179dd1ccd919a32a870842d39a3c504368a6ec

Merge "Add NetworkRequest.Builder creating from an existing instance"

framework/api/current.txt

diff --git a/framework/api/current.txt b/framework/api/current.txt
index e415e01..ad44b27 100644
--- a/framework/api/current.txt
+++ b/framework/api/current.txt
@@ -396,6 +396,7 @@
 
   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();

framework/src/android/net/NetworkRequest.java

diff --git a/framework/src/android/net/NetworkRequest.java b/framework/src/android/net/NetworkRequest.java
index 23c92a5..bcbc04f7 100644
--- a/framework/src/android/net/NetworkRequest.java
+++ b/framework/src/android/net/NetworkRequest.java
@@ -216,6 +216,14 @@
         }
 
         /**
+         * 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.
          */
         public NetworkRequest build() {