Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea24117e authored by James Mattis's avatar James Mattis Committed by Automerger Merge Worker
Browse files

Merge "Using defensive copy for default request remove" am: 1444e3ee am:... 

Merge "Using defensive copy for default request remove" am: 1444e3ee am: 6cc86364 am: 463695ca am: b69e9942

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib61a89c730b84c5a2df421d1bdaa67a47e817b22
parents 9eef36ca b69e9942

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

    }