Merge "Hide blocking pay phone option use carrier config"

am: c365007e5f

Change-Id: I4385f33d658a394d80e0b0722faf5ca12df940f6
This commit is contained in:
Youming Ye
2019-03-26 15:56:42 -07:00
committed by android-build-merger

View File

@@ -1843,6 +1843,14 @@ public class CarrierConfigManager {
public static final String KEY_EDITABLE_WFC_ROAMING_MODE_BOOL =
"editable_wfc_roaming_mode_bool";
/**
* Flag specifying wether to show blocking pay phone option in blocked numbers screen. Only show
* the option if payphone call presentation represents in the carrier's region.
* @hide
*/
public static final java.lang.String KEY_SHOW_BLOCKING_PAY_PHONE_OPTION_BOOL =
"show_blocking_pay_phone_option_bool";
/**
* Flag specifying whether the carrier will use the WFC home network mode in roaming network.
* {@code false} - roaming preference can be selected separately from the home preference.
@@ -2823,6 +2831,7 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_NOTIFY_VT_HANDOVER_TO_WIFI_FAILURE_BOOL, false);
sDefaults.putStringArray(KEY_FILTERED_CNAP_NAMES_STRING_ARRAY, null);
sDefaults.putBoolean(KEY_EDITABLE_WFC_ROAMING_MODE_BOOL, false);
sDefaults.putBoolean(KEY_SHOW_BLOCKING_PAY_PHONE_OPTION_BOOL, false);
sDefaults.putBoolean(KEY_USE_WFC_HOME_NETWORK_MODE_IN_ROAMING_NETWORK_BOOL, false);
sDefaults.putBoolean(KEY_STK_DISABLE_LAUNCH_BROWSER_BOOL, false);
sDefaults.putBoolean(KEY_PERSIST_LPP_MODE_BOOL, true);