Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use Concurrent HashMaps for Callback Registration" into udc-dev

Browse Source
This commit is contained in:
Nathan Harold
2023-02-28 20:36:56 +00:00
committed by Android (Google) Code Review
parent 6bfff79325 d656849e91
commit 1a4e44610f
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/telephony/TelephonyRegistryManager.java
View File

@@ -53,9 +53,7 @@ import com.android.internal.telephony.ITelephonyRegistry;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.Set; import java.util.Set;
import java.util.WeakHashMap; import java.util.WeakHashMap;
@@ -83,15 +81,16 @@ public class TelephonyRegistryManager {
* A mapping between {@link SubscriptionManager.OnSubscriptionsChangedListener} and * A mapping between {@link SubscriptionManager.OnSubscriptionsChangedListener} and
* its callback IOnSubscriptionsChangedListener. * its callback IOnSubscriptionsChangedListener.
*/ */
private final Map<SubscriptionManager.OnSubscriptionsChangedListener, private final ConcurrentHashMap<SubscriptionManager.OnSubscriptionsChangedListener,
IOnSubscriptionsChangedListener> mSubscriptionChangedListenerMap = new HashMap<>(); IOnSubscriptionsChangedListener>
mSubscriptionChangedListenerMap = new ConcurrentHashMap<>();
/** /**
* A mapping between {@link SubscriptionManager.OnOpportunisticSubscriptionsChangedListener} and * A mapping between {@link SubscriptionManager.OnOpportunisticSubscriptionsChangedListener} and
* its callback IOnSubscriptionsChangedListener. * its callback IOnSubscriptionsChangedListener.
*/ */
private final Map<SubscriptionManager.OnOpportunisticSubscriptionsChangedListener, private final ConcurrentHashMap<SubscriptionManager.OnOpportunisticSubscriptionsChangedListener,
IOnSubscriptionsChangedListener> mOpportunisticSubscriptionChangedListenerMap IOnSubscriptionsChangedListener>
= new HashMap<>(); mOpportunisticSubscriptionChangedListenerMap = new ConcurrentHashMap<>();
/** /**
* A mapping between {@link CarrierConfigManager.CarrierConfigChangeListener} and its callback * A mapping between {@link CarrierConfigManager.CarrierConfigChangeListener} and its callback