commit f7dce7b003039adc262376cef80943886e528ec7
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Jun 11 23:24:50 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Jun 11 23:24:50 2024 +0000
tree f25176726baabd478e3dad331c863328e1ab198f
parent 3b6267d942619f1cf4bd3f5fb732d3551395b88a
parent 6e1a388e3c1c6b80966000e43bbc16fdf207f5a4

Snap for 11954976 from 6e1a388e3c1c6b80966000e43bbc16fdf207f5a4 to 24Q3-release

Change-Id: I13ab79101cab9e34535f6740031f41e9bf90a3e5

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