Merge "Add carrier config to show wifi calling icon in status bar" am: d5579959e4 am: 6ab26e6bf5 am: 013fbff816

Change-Id: Ib50d2d5f5197a6d6e11070d7b0c93165ca8d3475
This commit is contained in:
Automerger Merge Worker
2020-03-02 23:49:15 +00:00

View File

@@ -3059,6 +3059,13 @@ public class CarrierConfigManager {
public static final String KEY_ASCII_7_BIT_SUPPORT_FOR_LONG_MESSAGE_BOOL =
"ascii_7_bit_support_for_long_message_bool";
/**
* Controls whether to show wifi calling icon in statusbar when wifi calling is available.
* @hide
*/
public static final String KEY_SHOW_WIFI_CALLING_ICON_IN_STATUS_BAR_BOOL =
"show_wifi_calling_icon_in_status_bar_bool";
/**
* Controls RSRP threshold at which OpportunisticNetworkService will decide whether
* the opportunistic network is good enough for internet data.
@@ -4061,6 +4068,7 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_UNMETERED_NR_NSA_MMWAVE_BOOL, false);
sDefaults.putBoolean(KEY_UNMETERED_NR_NSA_SUB6_BOOL, false);
sDefaults.putBoolean(KEY_ASCII_7_BIT_SUPPORT_FOR_LONG_MESSAGE_BOOL, false);
sDefaults.putBoolean(KEY_SHOW_WIFI_CALLING_ICON_IN_STATUS_BAR_BOOL, false);
/* Default value is minimum RSRP level needed for SIGNAL_STRENGTH_GOOD */
sDefaults.putInt(KEY_OPPORTUNISTIC_NETWORK_ENTRY_THRESHOLD_RSRP_INT, -108);
/* Default value is minimum RSRP level needed for SIGNAL_STRENGTH_MODERATE */