| commit | 527cae16f6281bfb25b13ba4dfca11635cfb1f44 | [log] [tgz] |
|---|---|---|
| author | James Mattis <jmattis@google.com> | Sun Feb 21 06:15:29 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Feb 21 06:15:29 2021 +0000 |
| tree | f6f2ff9336d034733f6079704095344296103f12 | |
| parent | c60471d42baf9f18c3c11279f599fc81be5d1d2b [diff] | |
| parent | c3232523e3e5ccf277b5360b87ba8d4227229ead [diff] |
Merge "Using defensive copy for default request remove" am: be9a647b2c am: c3232523e3 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597518 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7e342da488c7b9271b135a462312d3275abde692
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); }