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

Commit 48517b37 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fixed the concurrent modified exception" into sc-qpr1-dev am: b0936add am: d283b1b0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/15723523

Change-Id: I3f99238b7ca7f469d3203c6611c9a70adac1f364
parents 7c6fb311 d283b1b0

src/java/com/android/internal/telephony/dataconnection/DcNetworkAgent.java

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import android.telephony.NetworkRegistrationInfo; 
import android.telephony.ServiceState;

import android.telephony.TelephonyManager;

import android.telephony.data.QosBearerSession;

import android.util.ArrayMap;

import android.util.LocalLog;

import android.util.SparseArray;
@@ -58,6 +57,7 @@ import java.util.List; 
import java.util.Map;

import java.util.Objects;

import java.util.UUID;

import java.util.concurrent.ConcurrentHashMap;

import java.util.concurrent.Executor;

import java.util.concurrent.Executors;

import java.util.concurrent.TimeUnit;
@@ -94,7 +94,7 @@ public class DcNetworkAgent extends NetworkAgent { 
    private final LocalLog mNetCapsLocalLog = new LocalLog(32);



    // For interface duplicate detection. Key is the net id, value is the interface name in string.

    private static Map<Integer, String> sInterfaceNames = new ArrayMap<>();

    private static Map<Integer, String> sInterfaceNames = new ConcurrentHashMap<>();



    private static final long NETWORK_UNWANTED_ANOMALY_WINDOW_MS = TimeUnit.MINUTES.toMillis(5);

    private static final int NETWORK_UNWANTED_ANOMALY_NUM_OCCURRENCES =  12;