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

Commit 3ba0f5da authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "TelephonyRegistry: Avoid adding duplicate listener" am: 63341523 

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

Change-Id: I5859f20686e50ae9c98f8acca54a375276944073
parents 476c64e4 63341523

core/java/android/telephony/TelephonyRegistryManager.java

+11 −0
Original line number Diff line number Diff line
@@ -104,6 +104,10 @@ public class TelephonyRegistryManager { 
    public void addOnSubscriptionsChangedListener(

            @NonNull SubscriptionManager.OnSubscriptionsChangedListener listener,

            @NonNull Executor executor) {

        if (mSubscriptionChangedListenerMap.get(listener) != null) {

            Log.d(TAG, "addOnSubscriptionsChangedListener listener already present");

            return;

        }

        IOnSubscriptionsChangedListener callback = new IOnSubscriptionsChangedListener.Stub() {

            @Override

            public void onSubscriptionsChanged () {
@@ -153,6 +157,10 @@ public class TelephonyRegistryManager { 
    public void addOnOpportunisticSubscriptionsChangedListener(

            @NonNull SubscriptionManager.OnOpportunisticSubscriptionsChangedListener listener,

            @NonNull Executor executor) {

        if (mOpportunisticSubscriptionChangedListenerMap.get(listener) != null) {

            Log.d(TAG, "addOnOpportunisticSubscriptionsChangedListener listener already present");

            return;

        }

        /**

         * The callback methods need to be called on the executor thread where

         * this object was created.  If the binder did that for us it'd be nice.
@@ -188,6 +196,9 @@ public class TelephonyRegistryManager { 
     */

    public void removeOnOpportunisticSubscriptionsChangedListener(

            @NonNull SubscriptionManager.OnOpportunisticSubscriptionsChangedListener listener) {

        if (mOpportunisticSubscriptionChangedListenerMap.get(listener) == null) {

            return;

        }

        try {

            sRegistry.removeOnSubscriptionsChangedListener(mContext.getOpPackageName(),

                    mOpportunisticSubscriptionChangedListenerMap.get(listener));