Merge "Add config to show an alert dialog for video charges" am: 1451124f86

am: 2c773d3f96

Change-Id: If13158f209eda968f0fd50787679c957a3e5ea96
This commit is contained in:
Masaho Nishikawa
2018-03-03 06:51:01 +00:00
committed by android-build-merger

View File

@@ -1585,6 +1585,14 @@ public class CarrierConfigManager {
public static final String KEY_NOTIFY_INTERNATIONAL_CALL_ON_WFC_BOOL =
"notify_international_call_on_wfc_bool";
/**
* Flag specifying whether to show an alert dialog for video call charges.
* By default this value is {@code false}.
* @hide
*/
public static final String KEY_SHOW_VIDEO_CALL_CHARGES_ALERT_DIALOG_BOOL =
"show_video_call_charges_alert_dialog_bool";
/**
* An array containing custom call forwarding number prefixes that will be blocked while the
* device is reporting that it is roaming. By default, there are no custom call
@@ -2120,6 +2128,7 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_DISPLAY_VOICEMAIL_NUMBER_AS_DEFAULT_CALL_FORWARDING_NUMBER_BOOL,
false);
sDefaults.putBoolean(KEY_NOTIFY_INTERNATIONAL_CALL_ON_WFC_BOOL, false);
sDefaults.putBoolean(KEY_SHOW_VIDEO_CALL_CHARGES_ALERT_DIALOG_BOOL, false);
sDefaults.putStringArray(KEY_CALL_FORWARDING_BLOCKS_WHILE_ROAMING_STRING_ARRAY,
null);
sDefaults.putInt(KEY_LTE_EARFCNS_RSRP_BOOST_INT, 0);