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

Commit 9f3f0bca authored by Brad Ebinger's avatar Brad Ebinger Committed by Gerrit Code Review
Browse files

Merge "Improve carrierconfig to support multisim in GsmCdmaPhone"

parents 77aca29a 11b5a183

src/java/com/android/internal/telephony/GsmCdmaPhone.java

+3 −3
Original line number Diff line number Diff line
@@ -1402,7 +1402,7 @@ public class GsmCdmaPhone extends Phone { 
        if (TextUtils.isEmpty(number)) {

            CarrierConfigManager configManager = (CarrierConfigManager)

                    getContext().getSystemService(Context.CARRIER_CONFIG_SERVICE);

            PersistableBundle b = configManager.getConfig();

            PersistableBundle b = configManager.getConfigForSubId(getSubId());

            if (b != null) {

                String defaultVmNumber =

                        b.getString(CarrierConfigManager.KEY_DEFAULT_VM_NUMBER_STRING);
@@ -1420,7 +1420,7 @@ public class GsmCdmaPhone extends Phone { 
            // Read platform settings for dynamic voicemail number

            CarrierConfigManager configManager = (CarrierConfigManager)

                    getContext().getSystemService(Context.CARRIER_CONFIG_SERVICE);

            PersistableBundle b = configManager.getConfig();

            PersistableBundle b = configManager.getConfigForSubId(getSubId());

            if (b != null && b.getBoolean(

                    CarrierConfigManager.KEY_CONFIG_TELEPHONY_USE_OWN_NUMBER_FOR_VOICEMAIL_BOOL)) {

                number = getLine1Number();
@@ -2102,7 +2102,7 @@ public class GsmCdmaPhone extends Phone { 
    public boolean supports3gppCallForwardingWhileRoaming() {

        CarrierConfigManager configManager = (CarrierConfigManager)

                getContext().getSystemService(Context.CARRIER_CONFIG_SERVICE);

        PersistableBundle b = configManager.getConfig();

        PersistableBundle b = configManager.getConfigForSubId(getSubId());

        if (b != null) {

            return b.getBoolean(

                    CarrierConfigManager.KEY_SUPPORT_3GPP_CALL_FORWARDING_WHILE_ROAMING_BOOL, true);