commit a87380e13bee0ac7630a5edb777b2bc0b6f90ddf
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Aug 29 23:38:49 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 29 23:38:49 2024 +0000
tree f85481a5ddf6ad3863a2db7bb4349fdc8d4a37af
parent da780e052460deec673ae7cffbd62a7e3fa58ef3
parent c1fad9e26557547733c03bccd35d233e87806fa0

Merge "Fix isEnhancedCallBlockingEnabledByPlatform crash on missing CCM." into main

src/com/android/server/telecom/settings/BlockedNumbersUtil.java

diff --git a/src/com/android/server/telecom/settings/BlockedNumbersUtil.java b/src/com/android/server/telecom/settings/BlockedNumbersUtil.java
index 3e1da17..99c5746 100644
--- a/src/com/android/server/telecom/settings/BlockedNumbersUtil.java
+++ b/src/com/android/server/telecom/settings/BlockedNumbersUtil.java
@@ -133,9 +133,12 @@
     public static boolean isEnhancedCallBlockingEnabledByPlatform(Context context) {
         CarrierConfigManager configManager = (CarrierConfigManager) context.getSystemService(
                 Context.CARRIER_CONFIG_SERVICE);
-        PersistableBundle carrierConfig = configManager.getConfig();
+        PersistableBundle carrierConfig = null;
+        if (configManager != null) {
+            carrierConfig = configManager.getConfig();
+        }
         if (carrierConfig == null) {
-            carrierConfig = configManager.getDefaultConfig();
+            carrierConfig = CarrierConfigManager.getDefaultConfig();
         }
         return carrierConfig.getBoolean(
                 CarrierConfigManager.KEY_SUPPORT_ENHANCED_CALL_BLOCKING_BOOL)