Merge "Make sure the RcsProvisioningInfo removed from mRcsFeatureListeners when it is destroyed" am: 9f90716e49 am: bdbcf267abtemp_ab_7272582

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1672007

Change-Id: I3335de3bc845538b057dcaeda9df8e576f29decf

1 files changed, 3 insertions, 4 deletions

diff --git a/src/com/android/phone/RcsProvisioningMonitor.java b/src/com/android/phone/RcsProvisioningMonitor.java
index 445ff84d6..18c8c0b2b 100644
--- a/src/com/android/phone/RcsProvisioningMonitor.java
+++ b/src/com/android/phone/RcsProvisioningMonitor.java
@@ -845,10 +845,9 @@ public class RcsProvisioningMonitor {
     }
 
     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);
         }
     }