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

Commit 0b38a4b9 authored by Honggang Luo's avatar Honggang Luo Committed by Torbjorn Eklund
Browse files

Use KEY_ENHANCED_4G_LTE_ON_BY_DEFAULT_BOOL when VoLTE Setting hidden 

If "Enhanced 4G LTE Mode" Switch setting is hidden, use the default
value specified by KEY_ENHANCED_4G_LTE_ON_BY_DEFAULT_BOOL as
Enhanced 4G LTE Mode setting.

Bug: 113346089
Test: Manual
Change-Id: Iccb43cedac38364e619ad6f374481799606aba44
parent 439561ad

src/java/com/android/ims/ImsManager.java

+11 −7
Original line number Diff line number Diff line
@@ -434,7 +434,8 @@ public class ImsManager { 


    /**

     * Returns the user configuration of Enhanced 4G LTE Mode setting for slot. If the option is

     * not editable ({@link CarrierConfigManager#KEY_EDITABLE_ENHANCED_4G_LTE_BOOL} is false), or

     * not editable ({@link CarrierConfigManager#KEY_EDITABLE_ENHANCED_4G_LTE_BOOL} is false),

     * hidden ({@link CarrierConfigManager#KEY_HIDE_ENHANCED_4G_LTE_BOOL} is true), or

     * the setting is not initialized, this method will return default value specified by

     * {@link CarrierConfigManager#KEY_ENHANCED_4G_LTE_ON_BY_DEFAULT_BOOL}.

     *
@@ -448,8 +449,10 @@ public class ImsManager { 
        boolean onByDefault = getBooleanCarrierConfig(

                CarrierConfigManager.KEY_ENHANCED_4G_LTE_ON_BY_DEFAULT_BOOL);



        // If Enhanced 4G LTE Mode is uneditable or not initialized, we use the default value

        // If Enhanced 4G LTE Mode is uneditable, hidden or not initialized, we use the default

        // value

        if (!getBooleanCarrierConfig(CarrierConfigManager.KEY_EDITABLE_ENHANCED_4G_LTE_BOOL)

                || getBooleanCarrierConfig(CarrierConfigManager.KEY_HIDE_ENHANCED_4G_LTE_BOOL)

                || setting == SUB_PROPERTY_NOT_INITIALIZED) {

            return onByDefault;

        } else {
@@ -474,15 +477,16 @@ public class ImsManager { 


    /**

     * Change persistent Enhanced 4G LTE Mode setting. If the option is not editable

     * ({@link CarrierConfigManager#KEY_EDITABLE_ENHANCED_4G_LTE_BOOL} is false), this method will

     * set the setting to the default value specified by

     * ({@link CarrierConfigManager#KEY_EDITABLE_ENHANCED_4G_LTE_BOOL} is false)

     * or hidden ({@link CarrierConfigManager#KEY_HIDE_ENHANCED_4G_LTE_BOOL} is true),

     * this method will set the setting to the default value specified by

     * {@link CarrierConfigManager#KEY_ENHANCED_4G_LTE_ON_BY_DEFAULT_BOOL}.

     *

     */

    public void setEnhanced4gLteModeSetting(boolean enabled) {

        int subId = getSubId();

        // If editable=false, we must keep default advanced 4G mode.

        if (!getBooleanCarrierConfig(CarrierConfigManager.KEY_EDITABLE_ENHANCED_4G_LTE_BOOL)) {

        // If editable=false or hidden=true, we must keep default advanced 4G mode.

        if (!getBooleanCarrierConfig(CarrierConfigManager.KEY_EDITABLE_ENHANCED_4G_LTE_BOOL) ||

                getBooleanCarrierConfig(CarrierConfigManager.KEY_HIDE_ENHANCED_4G_LTE_BOOL)) {

            enabled = getBooleanCarrierConfig(

                    CarrierConfigManager.KEY_ENHANCED_4G_LTE_ON_BY_DEFAULT_BOOL);

        }