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

Commit 57a97d22 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11635697 from 92ca5921 to 24Q3-release 

Change-Id: If4b125e6af2ee12964177896ea466f223892dc18
parents 263d3add 92ca5921

src/com/android/server/telecom/CallLogManager.java

+3 −4
Original line number Diff line number Diff line
@@ -254,12 +254,11 @@ public final class CallLogManager extends CallsManagerListenerBase { 
                return false;

            }



            PersistableBundle b = mCarrierConfigManager.getConfigForSubId(subscriptionId);

            if (b == null) {

            if (mCarrierConfigManager == null) {

                return false;

            }



            if (b.getBoolean(KEY_SUPPORT_IMS_CONFERENCE_EVENT_PACKAGE_BOOL, true)) {

            PersistableBundle b = mCarrierConfigManager.getConfigForSubId(subscriptionId);

            if (b == null || b.getBoolean(KEY_SUPPORT_IMS_CONFERENCE_EVENT_PACKAGE_BOOL, true)) {

                return false;

            }

        }

src/com/android/server/telecom/CallsManager.java

+2 −0
Original line number Diff line number Diff line
@@ -952,6 +952,7 @@ public class CallsManager extends Call.ListenerBase 
        ComponentName componentName = null;

        CarrierConfigManager configManager = (CarrierConfigManager) mContext.getSystemService

                (Context.CARRIER_CONFIG_SERVICE);

        if (configManager == null) return null;

        PersistableBundle configBundle = configManager.getConfig();

        if (configBundle != null) {

            componentName = ComponentName.unflattenFromString(configBundle.getString
@@ -3705,6 +3706,7 @@ public class CallsManager extends Call.ListenerBase 
        int subscriptionId = mPhoneAccountRegistrar.getSubscriptionIdForPhoneAccount(handle);

        CarrierConfigManager carrierConfigManager =

                mContext.getSystemService(CarrierConfigManager.class);

        if (carrierConfigManager == null) return new PersistableBundle();

        PersistableBundle result = carrierConfigManager.getConfigForSubId(subscriptionId);

        return result == null ? new PersistableBundle() : result;

    }