Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add carrier config for 5G Icon" am: 2aee6901fb

Browse Source 
am: 14a78540b8

Change-Id: I2697bd8d2df5ef9a519b29bed577d81c3043266a
This commit is contained in:
Pengquan Meng
2019-03-06 14:02:15 -08:00
committed by android-build-merger
parent d5139f1b37 14a78540b8
commit 74a8836175
1 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -2437,6 +2437,32 @@ public class CarrierConfigManager {
public static final String KEY_CDMA_ENHANCED_ROAMING_INDICATOR_FOR_HOME_NETWORK_INT_ARRAY = public static final String KEY_CDMA_ENHANCED_ROAMING_INDICATOR_FOR_HOME_NETWORK_INT_ARRAY =
"cdma_enhanced_roaming_indicator_for_home_network_int_array"; "cdma_enhanced_roaming_indicator_for_home_network_int_array";
/**
* 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. */ /** The default value for every variable. */
private final static PersistableBundle sDefaults; private final static PersistableBundle sDefaults;
@@ -2814,6 +2840,8 @@ public class CarrierConfigManager {
new int[] { new int[] {
1 /* Roaming Indicator Off */ 1 /* Roaming Indicator Off */
}); });
sDefaults.putString(KEY_5G_ICON_CONFIGURATION_STRING,
"connected_mmwave:None,connected:5G,not_restricted:None,restricted:None");
} }
/** /**