| commit | f659d4a23cb980d287e3d726c96786120c432271 | [log] [tgz] |
|---|---|---|
| author | James Mattis <jmattis@google.com> | Sun Feb 21 06:51:29 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Feb 21 06:51:29 2021 +0000 |
| tree | f414a09dd46e7230c7610b814a2b4524f6bd3c44 | |
| parent | da34538df186b182ac61a54d3ec89c5b8123dc9a [diff] | |
| parent | 527cae16f6281bfb25b13ba4dfca11635cfb1f44 [diff] |
Merge "Using defensive copy for default request remove" am: be9a647b2c am: c3232523e3 am: 527cae16f6 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597518 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1a67077a777654a50f3cff385d48a65c9dd71e85
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index f54551e..9d86f4e 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -9033,7 +9033,8 @@ private void updateDefaultNetworksForOemNetworkPreference( @NonNull final Set<NetworkRequestInfo> nris) { - handleRemoveNetworkRequests(mDefaultNetworkRequests); + // Pass in a defensive copy as this collection will be updated on remove. + handleRemoveNetworkRequests(new ArraySet<>(mDefaultNetworkRequests)); addPerAppDefaultNetworkRequests(nris); }