commit be9a647b2c87b7e0fb2f44fc3a005d9411049a19
author James Mattis <jmattis@google.com> Sun Feb 21 04:28:13 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sun Feb 21 04:28:13 2021 +0000
tree f6f2ff9336d034733f6079704095344296103f12
parent ef921b95d703402992dea8f361c76469a2488d82
parent 15c1b2108c8c51f505b13f60e2fefc7f2a967b68

Merge "Using defensive copy for default request remove"

services/core/java/com/android/server/ConnectivityService.java

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);
     }