| commit | e515eb59b10e450ba81f99918964a3e24926c8b5 | [log] [tgz] |
|---|---|---|
| author | Patrick Rohr <prohr@google.com> | Wed May 25 02:41:50 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed May 25 02:41:50 2022 +0000 |
| tree | 1a217b4390d8272252a4c8a94156c830af7b24bf | |
| parent | 1d0e33db3a2a2e6ecb4a71c361f9bc0feac07d42 [diff] | |
| parent | ec966d65288381baa676b3c0ce38c3c8167ab5b9 [diff] |
Merge "Revert "NetworkRequest.Builder should create a defensive copy of capabilities"" am: ec966d6528 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2104464 Change-Id: Ie7108037e1c303cfcbd14d1a880463a06321dc8f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/framework/src/android/net/NetworkRequest.java b/framework/src/android/net/NetworkRequest.java index 6245e07..4f9d845 100644 --- a/framework/src/android/net/NetworkRequest.java +++ b/framework/src/android/net/NetworkRequest.java
@@ -220,7 +220,7 @@ */ public Builder(@NonNull final NetworkRequest request) { Objects.requireNonNull(request); - mNetworkCapabilities = new NetworkCapabilities(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.