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

Commit 27c00eac authored by Nathan Harold's avatar Nathan Harold Committed by Automerger Merge Worker
Browse files

Merge "Use Concurrent HashMaps for Callback Registration" into udc-dev am: 1a4e4461 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21644760



Change-Id: I4cba07582260786b4a36cfa47eda713d4a354171
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9db848fb 1a4e4461

core/java/android/telephony/TelephonyRegistryManager.java

+6 −7
Original line number Diff line number Diff line
@@ -53,9 +53,7 @@ import com.android.internal.telephony.ITelephonyRegistry; 


import java.lang.ref.WeakReference;

import java.util.Arrays;

import java.util.HashMap;

import java.util.List;

import java.util.Map;

import java.util.Objects;

import java.util.Set;

import java.util.WeakHashMap;
@@ -83,15 +81,16 @@ public class TelephonyRegistryManager { 
     * A mapping between {@link SubscriptionManager.OnSubscriptionsChangedListener} and

     * its callback IOnSubscriptionsChangedListener.

     */

    private final Map<SubscriptionManager.OnSubscriptionsChangedListener,

                IOnSubscriptionsChangedListener> mSubscriptionChangedListenerMap = new HashMap<>();

    private final ConcurrentHashMap<SubscriptionManager.OnSubscriptionsChangedListener,

            IOnSubscriptionsChangedListener>

                    mSubscriptionChangedListenerMap = new ConcurrentHashMap<>();

    /**

     * A mapping between {@link SubscriptionManager.OnOpportunisticSubscriptionsChangedListener} and

     * its callback IOnSubscriptionsChangedListener.

     */

    private final Map<SubscriptionManager.OnOpportunisticSubscriptionsChangedListener,

            IOnSubscriptionsChangedListener> mOpportunisticSubscriptionChangedListenerMap

            = new HashMap<>();

    private final ConcurrentHashMap<SubscriptionManager.OnOpportunisticSubscriptionsChangedListener,

            IOnSubscriptionsChangedListener>

                    mOpportunisticSubscriptionChangedListenerMap = new ConcurrentHashMap<>();



    /**

     * A mapping between {@link CarrierConfigManager.CarrierConfigChangeListener} and its callback