Merge "Update VcnNetworkProvider to use thread safe Sets" into main am: ca384f86 am: 401a8aa6

        this(vcnContext, subscriptionGroup, config, snapshot, vcnCallback, new Dependencies());

    }

    // WARNING: This constructor executes on the binder thread. Thread safety MUST be ensured when

    // accessing data within this constructor and any methods called from here.

    @VisibleForTesting(visibility = Visibility.PRIVATE)

    public Vcn(

            @NonNull VcnContext vcnContext,

import android.os.Build;

import android.os.Handler;

import android.os.Looper;

import android.util.ArraySet;

import android.util.IndentingPrintWriter;

import android.util.Slog;

import java.util.Objects;

import java.util.Set;

import java.util.concurrent.ConcurrentHashMap;

import java.util.concurrent.Executor;

/**

 *

 * @hide

 */

// TODO(b/388919146): Implement a more generic solution to prevent concurrent modifications on

// mListeners and mRequests

// TODO(b/374174952): Replace VANILLA_ICE_CREAM with BAKLAVA after Android B finalization

@TargetApi(Build.VERSION_CODES.VANILLA_ICE_CREAM)

public class VcnNetworkProvider extends NetworkProvider {

    private static final String TAG = VcnNetworkProvider.class.getSimpleName();

    private final Set<NetworkRequestListener> mListeners = new ArraySet<>();

    private final Set<NetworkRequestListener> mListeners = ConcurrentHashMap.newKeySet();

    private final Context mContext;

    private final Handler mHandler;

     *

     * <p>NetworkRequests are immutable once created, and therefore can be used as stable keys.

     */

    private final Set<NetworkRequest> mRequests = new ArraySet<>();

    private final Set<NetworkRequest> mRequests = ConcurrentHashMap.newKeySet();

    public VcnNetworkProvider(@NonNull Context context, @NonNull Looper looper) {

        this(context, looper, new Dependencies());