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