commit de4d24b5a72760607dbfd99a498d580b97a7c761
author Brad Ebinger <breadley@google.com> Tue Jun 11 00:03:28 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 11 00:03:28 2024 +0000
tree 047f3a02ba892daacac867eca1aab4300e84a3b0
parent 234e18b77e75a5837d79450fcff0571bd710a138
parent 5cf46dc25434a2c752754e10e323fef2950f5cc0

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

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

Change-Id: I215273a9286cd8725c9e46bbd28aee06e4d53eff
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 56c568f..1f87593 100644
--- a/src/com/android/server/telecom/CallLogManager.java
+++ b/src/com/android/server/telecom/CallLogManager.java
@@ -461,8 +461,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);