LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Using defensive copy for default request remove" am: be9a647b2c am: c3232523e3

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597518

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7e342da488c7b9271b135a462312d3275abde692
This commit is contained in:
James Mattis
2021-02-21 06:15:29 +00:00
committed by Automerger Merge Worker
parent c60471d42b c3232523e3
commit 527cae16f6
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -9033,7 +9033,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
private void updateDefaultNetworksForOemNetworkPreference( private void updateDefaultNetworksForOemNetworkPreference(
@NonNull final Set<NetworkRequestInfo> nris) { @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); addPerAppDefaultNetworkRequests(nris);
} }