commit c99ace8f0457560d1ad999eaa96eeabb7557cc36
author Hui Wang <huiwang@google.com> Tue Oct 05 16:28:38 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Oct 05 16:28:38 2021 +0000
tree f4d3b7bf201a86c6008921a15fb7419d8ece21db
parent d4b22f69a6a57d22912cbe0128e3bc89acd76b76
parent d883d46f81cf5304c4bfa8bfa8bbf2d8307871aa

Check whether the sub still available when handling the request am: d883d46f81

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

Change-Id: If504841aad66c1019e44dc87aa3290a87240783c

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);
     }