commit d883d46f81cf5304c4bfa8bfa8bbf2d8307871aa
author Hui Wang <huiwang@google.com> Mon Oct 04 13:26:56 2021 -0700
committer Hui Wang <huiwang@google.com> Mon Oct 04 21:14:15 2021 +0000
tree f4d3b7bf201a86c6008921a15fb7419d8ece21db
parent 78c885aa1e7891e812bb3824003e5cac21afeb4d

Check whether the sub still available when handling the request

Bug: 196873187
Test: manual
Change-Id: I0acd490907f6b44db8746d772c8a5cf10fd52fa8

src/com/android/phone/RcsProvisioningMonitor.java

diff --git a/src/com/android/phone/RcsProvisioningMonitor.java b/src/com/android/phone/RcsProvisioningMonitor.java
index 85a4e3d..6d2bd6f 100644
--- a/src/com/android/phone/RcsProvisioningMonitor.java
+++ b/src/com/android/phone/RcsProvisioningMonitor.java
@@ -797,6 +797,10 @@
         logv("onConfigReceived, subId:" + subId + ", config:"
                 + config + ", isCompressed:" + isCompressed);
         RcsProvisioningInfo info = mRcsProvisioningInfos.get(subId);
+        if (info == null) {
+            logd("sub[" + subId + "] has been removed");
+            return;
+        }
         info.setConfig(isCompressed ? RcsConfig.decompressGzip(config) : config);
         updateConfigForSub(subId, config, isCompressed);
     }