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

Merge "TelephonyRegistry: Avoid adding duplicate listener" am: 6334152357 am: 3ba0f5da1d

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

Change-Id: Ie577f0736765ef1c79630c116351a669f972c778
This commit is contained in:
Treehugger Robot
2020-09-22 01:17:00 +00:00
committed by Automerger Merge Worker
parent 7904074696 3ba0f5da1d
commit 4aeb2ecda5
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -104,6 +104,10 @@ public class TelephonyRegistryManager {
public void addOnSubscriptionsChangedListener( public void addOnSubscriptionsChangedListener(
@NonNull SubscriptionManager.OnSubscriptionsChangedListener listener, @NonNull SubscriptionManager.OnSubscriptionsChangedListener listener,
@NonNull Executor executor) { @NonNull Executor executor) {
if (mSubscriptionChangedListenerMap.get(listener) != null) {
Log.d(TAG, "addOnSubscriptionsChangedListener listener already present");
return;
}
IOnSubscriptionsChangedListener callback = new IOnSubscriptionsChangedListener.Stub() { IOnSubscriptionsChangedListener callback = new IOnSubscriptionsChangedListener.Stub() {
@Override @Override
public void onSubscriptionsChanged () { public void onSubscriptionsChanged () {
@@ -153,6 +157,10 @@ public class TelephonyRegistryManager {
public void addOnOpportunisticSubscriptionsChangedListener( public void addOnOpportunisticSubscriptionsChangedListener(
@NonNull SubscriptionManager.OnOpportunisticSubscriptionsChangedListener listener, @NonNull SubscriptionManager.OnOpportunisticSubscriptionsChangedListener listener,
@NonNull Executor executor) { @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 * 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. * 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( public void removeOnOpportunisticSubscriptionsChangedListener(
@NonNull SubscriptionManager.OnOpportunisticSubscriptionsChangedListener listener) { @NonNull SubscriptionManager.OnOpportunisticSubscriptionsChangedListener listener) {
if (mOpportunisticSubscriptionChangedListenerMap.get(listener) == null) {
return;
}
try { try {
sRegistry.removeOnSubscriptionsChangedListener(mContext.getOpPackageName(), sRegistry.removeOnSubscriptionsChangedListener(mContext.getOpPackageName(),
mOpportunisticSubscriptionChangedListenerMap.get(listener)); mOpportunisticSubscriptionChangedListenerMap.get(listener));