Merge "Using defensive copy for default request remove" (1444e3ee) · Commits · e / os / android_frameworks_base

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -9033,7 +9033,8 @@ public class ConnectivityService extends IConnectivityManager.Stub

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