commit c1fad9e26557547733c03bccd35d233e87806fa0
author Tomasz Wasilczyk <twasilczyk@google.com> Tue Jul 16 13:44:06 2024 -0700
committer Tomasz Wasilczyk <twasilczyk@google.com> Thu Aug 29 09:17:44 2024 -0700
tree 2d748a9b598b4179067082cd68bd6bcdce11fe02
parent fcf0b72b10fc9a3a15903d85d94ee7c43926c3aa

Fix isEnhancedCallBlockingEnabledByPlatform crash on missing CCM.

Bug: 338170569
Bug: 338170984
Flag: EXEMPT bugfix
Test: abtd CtsTelecomTestCases:android.telecom.cts.ThirdPartyCallScreeningServiceTest
Test: abtd CtsTelecomTestCases:android.telecom.cts.ExtendedInCallServiceTest
Change-Id: Idc3df8383aa9b9548cbd0a752320ac9a8e07aa14

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)