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

Commit a87380e1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

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

parents da780e05 c1fad9e2

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

+5 −2
Original line number Diff line number Diff line
@@ -133,9 +133,12 @@ public final class BlockedNumbersUtil { 
    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)