Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1fad9e2 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk
Browse files

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
parent fcf0b72b

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

+5 −2
Original line number Original line Diff line number Diff line
@@ -133,9 +133,12 @@ public final class BlockedNumbersUtil { 
    public static boolean isEnhancedCallBlockingEnabledByPlatform(Context context) {

    public static boolean isEnhancedCallBlockingEnabledByPlatform(Context context) {

        CarrierConfigManager configManager = (CarrierConfigManager) context.getSystemService(

        CarrierConfigManager configManager = (CarrierConfigManager) context.getSystemService(

                Context.CARRIER_CONFIG_SERVICE);

                Context.CARRIER_CONFIG_SERVICE);

        PersistableBundle carrierConfig = configManager.getConfig();

        PersistableBundle carrierConfig = null;

        if (configManager != null) {

            carrierConfig = configManager.getConfig();

        }

        if (carrierConfig == null) {

        if (carrierConfig == null) {

            carrierConfig = configManager.getDefaultConfig();

            carrierConfig = CarrierConfigManager.getDefaultConfig();

        }

        }

        return carrierConfig.getBoolean(

        return carrierConfig.getBoolean(

                CarrierConfigManager.KEY_SUPPORT_ENHANCED_CALL_BLOCKING_BOOL)

                CarrierConfigManager.KEY_SUPPORT_ENHANCED_CALL_BLOCKING_BOOL)