summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <android-build-prod@system.gserviceaccount.com>2020-04-07 18:14:37 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-04-07 18:14:37 +0000
commit194251d18fedf8b9ae6b9e43f3a99f876232663c (patch)
tree6512be8ce9b8cdad1f2a16f3204b0def021d64ee
parenta557c02b3fc652c4be27ed56653e96ee974414f4 (diff)
parent14d6bfbb327b3b4cd6832d65261f26b2bce0861b (diff)
Merge "Add KEY_HIDE_ENABLED_5G_BOOL config" into r-keystone-qcom-dev
-rw-r--r--telephony/java/android/telephony/CarrierConfigManager.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 7f05dbbab6ea..aaee9213b431 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -1198,6 +1198,15 @@ public class CarrierConfigManager {
public static final String KEY_HIDE_ENHANCED_4G_LTE_BOOL = "hide_enhanced_4g_lte_bool";
/**
+ * Determines whether the Enabled 5G toggle will be shown in the settings. When this
+ * option is {@code true}, the toggle will be hidden regardless of whether the device and
+ * carrier supports 5G or not.
+ *
+ * @hide
+ */
+ public static final String KEY_HIDE_ENABLED_5G_BOOL = "hide_enabled_5g_bool";
+
+ /**
* Sets the default state for the "Enhanced 4G LTE" or "Advanced Calling" mode toggle set by the
* user. When this is {@code true}, this mode by default is on, otherwise if {@code false},
* this mode by default is off.
@@ -3825,6 +3834,7 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_DISPLAY_HD_AUDIO_PROPERTY_BOOL, true);
sDefaults.putBoolean(KEY_EDITABLE_ENHANCED_4G_LTE_BOOL, true);
sDefaults.putBoolean(KEY_HIDE_ENHANCED_4G_LTE_BOOL, false);
+ sDefaults.putBoolean(KEY_HIDE_ENABLED_5G_BOOL, true);
sDefaults.putBoolean(KEY_ENHANCED_4G_LTE_ON_BY_DEFAULT_BOOL, true);
sDefaults.putBoolean(KEY_HIDE_IMS_APN_BOOL, false);
sDefaults.putBoolean(KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL, false);