Removed updating slot ID
Container for MmtelFeatureListener and RcsFeatureListner, creates and handles based on the slot ID.
MmtelFeatureListener and RcsFeatureListener should keep the slot ID internally.
Bug: 343572396
Flag: EXEMPT bugfix
Test: ImsProvisioningControllerTest, ImsServiceTest
Change-Id: Iebdf602a6261b7682073a54e12d2677b2db93d95
diff --git a/src/com/android/phone/ImsProvisioningController.java b/src/com/android/phone/ImsProvisioningController.java
index d2c720b..e4bda19 100644
--- a/src/com/android/phone/ImsProvisioningController.java
+++ b/src/com/android/phone/ImsProvisioningController.java
@@ -419,7 +419,6 @@
}
mSubId = subId;
- mSlotId = getSlotId(subId);
mConfigCallback.setSubId(subId);
}
@@ -531,7 +530,9 @@
if (mFeatureFlags.notifyInitialImsProvisioningStatus()) {
// Notify MmTel provisioning value based on capability and radio tech.
- if (mProvisioningCallbackManagersSlotMap.get(mSlotId).hasCallblacks()) {
+ ProvisioningCallbackManager p =
+ mProvisioningCallbackManagersSlotMap.get(mSlotId);
+ if (p != null && p.hasCallblacks()) {
notifyMmTelProvisioningStatus(mSlotId, mSubId, null);
}
}
@@ -658,7 +659,6 @@
}
mSubId = subId;
- mSlotId = getSlotId(subId);
mConfigCallback.setSubId(subId);
}
@@ -769,7 +769,9 @@
setInitialProvisioningKeys(mSubId);
if (mFeatureFlags.notifyInitialImsProvisioningStatus()) {
- if (mProvisioningCallbackManagersSlotMap.get(mSlotId).hasCallblacks()) {
+ ProvisioningCallbackManager p =
+ mProvisioningCallbackManagersSlotMap.get(mSlotId);
+ if (p != null && p.hasCallblacks()) {
// Notify RCS provisioning value based on capability and radio tech.
notifyRcsProvisioningStatus(mSlotId, mSubId, null);
}