From dfb3956cf1331e0a66e8ea51abd01172e0405328 Mon Sep 17 00:00:00 2001 From: Pengquan Meng Date: Wed, 5 Dec 2018 16:26:42 -0800 Subject: Add carrier config for 5G Icon Bug: 111453000 Test: build Change-Id: Ie4b331aaec3981dea0eeada436a2123fe9287b74 --- .../android/telephony/CarrierConfigManager.java | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 62cead17ac54..0a60e3409c9d 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -2361,6 +2361,32 @@ public class CarrierConfigManager { public static final String KEY_CALL_WAITING_SERVICE_CLASS_INT = "call_waiting_service_class_int"; + /** + * This configuration allow the system UI to display different 5G icon for different 5G status. + * + * There are four 5G status: + * 1. connected_mmwave: device currently connected to 5G cell as the secondary cell and using + * millimeter wave. + * 2. connected: device currently connected to 5G cell as the secondary cell but not using + * millimeter wave. + * 3. not_restricted: device camped on a network that has 5G capability(not necessary to connect + * a 5G cell as a secondary cell) and the use of 5G is not restricted. + * 4. restricted: device camped on a network that has 5G capability(not necessary to connect a + * 5G cell as a secondary cell) but the use of 5G is restricted. + * + * The configured string contains multiple key-value pairs separated by comma. For each pair, + * the key and value is separated by a colon. The key is corresponded to a 5G status above and + * the value is the icon name. Use "None" as the icon name if no icon should be shown in a + * specific 5G status. + * + * Here is an example of the configuration: + * "connected_mmwave:5GPlus,connected:5G,not_restricted:None,restricted:None" + * + * @hide + */ + public static final String KEY_5G_ICON_CONFIGURATION_STRING = + "5g_icon_configuration_string"; + /** The default value for every variable. */ private final static PersistableBundle sDefaults; @@ -2722,6 +2748,8 @@ public class CarrierConfigManager { sDefaults.putBoolean(KEY_USE_CALL_FORWARDING_USSD_BOOL, false); sDefaults.putBoolean(KEY_USE_CALLER_ID_USSD_BOOL, false); sDefaults.putInt(KEY_CALL_WAITING_SERVICE_CLASS_INT, 1 /* SERVICE_CLASS_VOICE */); + sDefaults.putString(KEY_5G_ICON_CONFIGURATION_STRING, + "connected_mmwave:None,connected:5G,not_restricted:None,restricted:None"); } /** -- cgit v1.2.3-59-g8ed1b