| commit | a8c50a75e6678e4af9c3df2aff39cec123b62ddc | [log] [tgz] |
|---|---|---|
| author | Hui Wang <huiwang@google.com> | Fri Apr 09 21:16:44 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 09 21:16:44 2021 +0000 |
| tree | 69e879e1a302d36d3abcb393a02f1054f3663c43 | |
| parent | 28e6b1a933da79fb94c782ccb8eff325f7263c73 [diff] | |
| parent | ef121b8697f8ecc3ccae2e75e395c0c9404a5c1c [diff] |
Merge "Make sure the RcsProvisioningInfo removed from mRcsFeatureListeners when it is destroyed" am: 9f90716e49 am: bdbcf267ab am: ef121b8697 Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1672007 Change-Id: I6c0bd1b4c43b45ae86ae31a78557a820debf0da2
diff --git a/src/com/android/phone/RcsProvisioningMonitor.java b/src/com/android/phone/RcsProvisioningMonitor.java index 8d975ec..9e30728 100644 --- a/src/com/android/phone/RcsProvisioningMonitor.java +++ b/src/com/android/phone/RcsProvisioningMonitor.java
@@ -840,10 +840,9 @@ } void unregisterRcsFeatureListener(RcsProvisioningInfo info) { - int slotId = SubscriptionManager.getSlotIndex(info.getSubId()); - RcsFeatureListener cb = mRcsFeatureListeners.get(slotId); - if (cb != null) { - cb.removeRcsProvisioningInfo(info); + // make sure the info to be removed in any case, even the slotId changed or invalid. + for (int i = 0; i < mRcsFeatureListeners.size(); i++) { + mRcsFeatureListeners.valueAt(i).removeRcsProvisioningInfo(info); } }