commit a1e232b188e0e0429c2370f9d269a7d5637077fe
author Pranav Madapurmath <pmadapurmath@google.com> Tue Jun 11 20:26:46 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 11 20:26:46 2024 +0000
tree 279fdaaa5d50af07cbb24926ccab855717f71019
parent 6e1a388e3c1c6b80966000e43bbc16fdf207f5a4
parent 9d97cd5825066ac8e15bbf97f6755663c5341afb

Merge "Unbind CallScreeningService when timeout reached." into main

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