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

Commit 8237b231 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12304452 from f6ce74c7 to 24Q4-release 

Change-Id: I6ae50fe7a81841eedc0f3c105f40444a9144ad35
parents d019efd1 f6ce74c7

Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -84,9 +84,9 @@ android_test { 
        "tests/res",

    ],

    libs: [

        "android.test.mock",

        "android.test.base",

        "android.test.runner",

        "android.test.mock.stubs.system",

        "android.test.base.stubs.system",

        "android.test.runner.stubs.system",

    ],



    jni_libs: [

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)