summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Joe LaPenna <jlapenna@google.com> 2016-12-12 21:39:55 +0000
committer android-build-merger <android-build-merger@google.com> 2016-12-12 21:39:55 +0000
commitb0977f52a60d3adc30848f91c6cac4a353e98c95 (patch)
tree3a18cd0e70f619365c862bc4a6797d14ec08466b
parent251e4283b175c1ad8c12c92528bec827ea24cdfe (diff)
parentb52989c736b3278f1ab5f6a9db8e555f40b99585 (diff)
Merge "Add simplified_network_settings_bool to CarrierConfigManager." am: 9b430e0395 am: 2bc66bf601
am: b52989c736 Change-Id: I06dcc86f7e11e0db205f712b41dd3e7d0194bb36
-rw-r--r--telephony/java/android/telephony/CarrierConfigManager.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 8d3322553cd1..be003c33aad0 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -153,6 +153,14 @@ public class CarrierConfigManager {
public static final String
KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL = "hide_carrier_network_settings_bool";
+ /**
+ * Control whether users receive a simplified network settings UI and improved network
+ * selection.
+ * @hide
+ */
+ public static final String
+ KEY_SIMPLIFIED_NETWORK_SETTINGS_BOOL = "simplified_network_settings_bool";
+
/** Control whether users can reach the SIM lock settings. */
public static final String
KEY_HIDE_SIM_LOCK_SETTINGS_BOOL = "hide_sim_lock_settings_bool";
@@ -1121,6 +1129,7 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_ENABLE_DIALER_KEY_VIBRATION_BOOL, true);
sDefaults.putBoolean(KEY_HAS_IN_CALL_NOISE_SUPPRESSION_BOOL, false);
sDefaults.putBoolean(KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL, false);
+ sDefaults.putBoolean(KEY_SIMPLIFIED_NETWORK_SETTINGS_BOOL, false);
sDefaults.putBoolean(KEY_HIDE_SIM_LOCK_SETTINGS_BOOL, false);
sDefaults.putBoolean(KEY_IGNORE_SIM_NETWORK_LOCKED_EVENTS_BOOL, false);
sDefaults.putBoolean(KEY_MDN_IS_ADDITIONAL_VOICEMAIL_NUMBER_BOOL, false);