commit 6e1a388e3c1c6b80966000e43bbc16fdf207f5a4
author Brad Ebinger <breadley@google.com> Tue Jun 11 00:20:58 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 11 00:20:58 2024 +0000
tree f25176726baabd478e3dad331c863328e1ab198f
parent dc161b667b82035c24c950b0ef3128262a4d5a23
parent de4d24b5a72760607dbfd99a498d580b97a7c761

Do not allow NPE if CarrierConfigManager service is null. am: 5cf46dc254 am: de4d24b5a7

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

Change-Id: Id46b66db4e19605114267d24cdb980436feff934
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/server/telecom/CallLogManager.java

diff --git a/src/com/android/server/telecom/CallLogManager.java b/src/com/android/server/telecom/CallLogManager.java
index 27535c0..4484e23 100644
--- a/src/com/android/server/telecom/CallLogManager.java
+++ b/src/com/android/server/telecom/CallLogManager.java
@@ -460,8 +460,8 @@
         boolean okToLogEmergencyNumber = false;
         CarrierConfigManager configManager = (CarrierConfigManager) mContext.getSystemService(
                 Context.CARRIER_CONFIG_SERVICE);
-        PersistableBundle configBundle = configManager.getConfigForSubId(
-                mPhoneAccountRegistrar.getSubscriptionIdForPhoneAccount(accountHandle));
+        PersistableBundle configBundle = (configManager != null) ? configManager.getConfigForSubId(
+                mPhoneAccountRegistrar.getSubscriptionIdForPhoneAccount(accountHandle)) : null;
         if (configBundle != null) {
             okToLogEmergencyNumber = configBundle.getBoolean(
                     CarrierConfigManager.KEY_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL);