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

Commit c9724688 authored by Honggang's avatar Honggang Committed by takeshi tanigawa
Browse files

Get carrier config value by subId 

It uses api "getConfig@CarrierConfigManager" to check whether the
emergency call is allowed in call log or not. But this api just
returns the carrier config of default sub. So the carrier config
may be incorrect if the sub is not the default sub on DS device.

Use "getConfigForSubId@CarrierConfigManager" for different sub.

Test: manual - make an emergency call and check the call log
Bug: 34336505

Change-Id: I1d869ea3e567a51dc766173d9bb7c7391de092ed
parent de6924cd

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -263,7 +263,8 @@ public final class CallLogManager extends CallsManagerListenerBase { 
        boolean okToLogEmergencyNumber = false;

        boolean okToLogEmergencyNumber = false;

        CarrierConfigManager configManager = (CarrierConfigManager) mContext.getSystemService(

        CarrierConfigManager configManager = (CarrierConfigManager) mContext.getSystemService(

                Context.CARRIER_CONFIG_SERVICE);

                Context.CARRIER_CONFIG_SERVICE);

        PersistableBundle configBundle = configManager.getConfig();

        PersistableBundle configBundle = configManager.getConfigForSubId(

                mPhoneAccountRegistrar.getSubscriptionIdForPhoneAccount(accountHandle));

        if (configBundle != null) {

        if (configBundle != null) {

            okToLogEmergencyNumber = configBundle.getBoolean(

            okToLogEmergencyNumber = configBundle.getBoolean(

                    CarrierConfigManager.KEY_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL);

                    CarrierConfigManager.KEY_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL);