summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author SongFerng Wang <songferngwang@google.com> 2019-08-20 20:41:25 -0700
committer android-build-merger <android-build-merger@google.com> 2019-08-20 20:41:25 -0700
commitee1ac4637c0e6848a67daba96a9013a80b872b30 (patch)
tree57245d32ecc4e599f12e55e792358c8a398cf222
parent8461060744630281bbd49b536634ef677d7450f5 (diff)
parent33f5edee258ff5ab28cfee111d0191d3c8eb7b01 (diff)
Merge "To modify 5G icon carrier config's comment: 5GPlus to 5G_Plus" into qt-qpr1-dev am: 712fc079a0
am: 33f5edee25 Change-Id: Id68bcd06b1893aceaee1a37032b0f05fbd024a8e
-rwxr-xr-xtelephony/java/android/telephony/CarrierConfigManager.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 34113a38a7ac..4fcda6393a56 100755
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -2678,10 +2678,12 @@ public class CarrierConfigManager {
* the value is the icon name. Use "None" as the icon name if no icon should be shown in a
* specific 5G scenario. If the scenario is "None", config can skip this key and value.
*
+ * Icon name options: "5G_Plus", "5G".
+ *
* Here is an example:
- * UE want to display 5GPlus icon for scenario#1, and 5G icon for scenario#2; otherwise no
+ * UE want to display 5G_Plus icon for scenario#1, and 5G icon for scenario#2; otherwise no
* define.
- * The configuration is: "connected_mmwave:5GPlus,connected:5G"
+ * The configuration is: "connected_mmwave:5G_Plus,connected:5G"
*
* @hide
*/