commit 5cf46dc25434a2c752754e10e323fef2950f5cc0
author Brad Ebinger <breadley@google.com> Mon Jun 10 17:44:56 2024 +0000
committer Brad Ebinger <breadley@google.com> Mon Jun 10 17:45:01 2024 +0000
tree 0b95b1927f2d137d6ed7ef3ad99dd62d2d6865e0
parent baccd54acb285368622167650e3d68c52ea37b20

Do not allow NPE if CarrierConfigManager service is null.

Change-Id: Ie4980526e670d3964ac37174a48a8d25dbb650d0
Test: atest CtsTelecomTestCases
Bug: 300090796

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 fc4e05d..93ea465 100644
--- a/src/com/android/server/telecom/CallLogManager.java
+++ b/src/com/android/server/telecom/CallLogManager.java
@@ -436,8 +436,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);