summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorYomna Nasser <yomna@google.com>2021-01-18 22:00:55 +0000
committerSongFerngWang <songferngwang@google.com>2021-03-17 20:21:21 +0800
commit1de59a9c597b0d83f783d9a029f177b123335a9a (patch)
tree5d6bd1edc786a6eafbfbb08e32ecfd281a3ad10e /core/java
parentf87b8a02a720f25c490ae9db2f12a72ed8c85470 (diff)
Implementation of "Enable 2G" for Settings.
(1) Adds KEY_HIDE_ENABLE_2G_BOOL to CarrierConfigManager, and (2) Adds new reason ALLOWED_NETWORK_TYPES_REASON_ENABLE_2G. Test: manual & atest -c Enable2gPreferenceControllerTest Bug: b/163168917 Change-Id: I81052549f8dde491697c35365320145fd24c3842 Merged-In: I81052549f8dde491697c35365320145fd24c3842
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/provider/Telephony.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java
index 9cb76c1ffb5d..753abea2cfe2 100644
--- a/core/java/android/provider/Telephony.java
+++ b/core/java/android/provider/Telephony.java
@@ -5284,7 +5284,8 @@ public final class Telephony {
* which network types are allowed for
* {@link TelephonyManager#ALLOWED_NETWORK_TYPES_REASON_USER},
* {@link TelephonyManager#ALLOWED_NETWORK_TYPES_REASON_POWER},
- * {@link TelephonyManager#ALLOWED_NETWORK_TYPES_REASON_CARRIER}.
+ * {@link TelephonyManager#ALLOWED_NETWORK_TYPES_REASON_CARRIER},
+ * {@link TelephonyManager#ALLOWED_NETWORK_TYPES_REASON_ENABLE_2G}.
* <P>Type: TEXT </P>
*
* @hide