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

Commit 77a3ae53 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fixed the concurrent modified exception" am: 5a83929f am: 55a732e4 

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

Change-Id: I49155ff3330947c9b6a90cc904d0841f009f2a1c
parents bb792054 55a732e4

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;