Merge "Merge "Hide blocking pay phone option use carrier config" am:... (89a5f8c8) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/CarrierConfigManager.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -1851,6 +1851,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.
		@@ -3024,6 +3032,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_ALLOW_METERED_NETWORK_FOR_CERT_DOWNLOAD_BOOL, false);