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

Commit 407ef3d2 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

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

Change-Id: I1050d5f2997993da13f10e5e28b7a24388951753
parents 65afa780 b0936add
Loading
Loading
Loading
Loading
+2 −3
Original line number Diff line number Diff line
@@ -37,9 +37,7 @@ import android.telephony.AnomalyReporter;
import android.telephony.NetworkRegistrationInfo;
import android.telephony.ServiceState;
import android.telephony.TelephonyManager;
import android.telephony.data.NrQosSessionAttributes;
import android.telephony.data.QosBearerSession;
import android.util.ArrayMap;
import android.util.LocalLog;
import android.util.SparseArray;

@@ -59,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;
@@ -95,7 +94,7 @@ public class DcNetworkAgent extends NetworkAgent {
    private final LocalLog mNetCapsLocalLog = new LocalLog(50);

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