diff options
| author | Honggang Luo <honggang.luo@sony.com> | 2018-09-21 11:49:00 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-09-21 11:49:00 -0700 |
| commit | f38de0d6f5de217367bacd844c1b1f9364df149b (patch) | |
| tree | cfc0a1bbbbeb0235e84a2534bf44e32f64c14041 | |
| parent | 1710af3d8ed4b15fc36f8f69d97d074fef66df0b (diff) | |
| parent | 0b38a4b98d6f76aad57fba90bd2efcd5189f6dd6 (diff) | |
| download | ims-f38de0d6f5de217367bacd844c1b1f9364df149b.tar.gz | |
Use KEY_ENHANCED_4G_LTE_ON_BY_DEFAULT_BOOL when VoLTE Setting hidden
am: 0b38a4b98d
Change-Id: I6e0801c7a102f96584d44d2e7a994e37da72f2d6
| -rw-r--r-- | src/java/com/android/ims/ImsManager.java | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/java/com/android/ims/ImsManager.java b/src/java/com/android/ims/ImsManager.java index f75fd433..d4198335 100644 --- a/src/java/com/android/ims/ImsManager.java +++ b/src/java/com/android/ims/ImsManager.java @@ -435,7 +435,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}. * @@ -449,8 +450,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 { @@ -475,15 +478,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); } |