Merge "De-couple data enabled from VT settings." am: 29fc1d78a9 (28097531) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/CarrierConfigManager.java

+19 −3

Original line number	Diff line number	Diff line
		@@ -332,13 +332,28 @@ public class CarrierConfigManager {
		public static final String KEY_DEFAULT_VM_NUMBER_STRING = "default_vm_number_string";

		/**
		* Flag indicating whether we should downgrade/terminate VT calls and disable VT when
		* data enabled changed (e.g. reach data limit or turn off data).
		* When {@code true}, changes to the mobile data enabled switch will not cause the VT
		* registration state to change. That is, turning on or off mobile data will not cause VT to be
		* enabled or disabled.
		* When {@code false}, disabling mobile data will cause VT to be de-registered.
		* <p>
		* See also {@link #KEY_VILTE_DATA_IS_METERED_BOOL}.
		* @hide
		*/
		public static final String KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS =
		"ignore_data_enabled_changed_for_video_calls";

		/**
		* Flag indicating whether data used for a video call over LTE is metered or not.
		* <p>
		* When {@code true}, if the device hits the data limit or data is disabled during a ViLTE call,
		* the call will be downgraded to audio-only (or paused if
		* {@link #KEY_SUPPORT_PAUSE_IMS_VIDEO_CALLS_BOOL} is {@code true}).
		*
		* @hide
		*/
		public static final String KEY_VILTE_DATA_IS_METERED_BOOL = "vilte_data_is_metered_bool";

		/**
		* Flag specifying whether WFC over IMS should be available for carrier: independent of
		* carrier provisioning. If false: hard disabled. If true: then depends on carrier
		@@ -1565,7 +1580,8 @@ public class CarrierConfigManager {
		sDefaults.putBoolean(KEY_NOTIFY_HANDOVER_VIDEO_FROM_WIFI_TO_LTE_BOOL, false);
		sDefaults.putBoolean(KEY_SUPPORT_DOWNGRADE_VT_TO_AUDIO_BOOL, true);
		sDefaults.putString(KEY_DEFAULT_VM_NUMBER_STRING, "");
		sDefaults.putBoolean(KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS, false);
		sDefaults.putBoolean(KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS, true);
		sDefaults.putBoolean(KEY_VILTE_DATA_IS_METERED_BOOL, true);
		sDefaults.putBoolean(KEY_CARRIER_WFC_IMS_AVAILABLE_BOOL, false);
		sDefaults.putBoolean(KEY_CARRIER_WFC_SUPPORTS_WIFI_ONLY_BOOL, false);
		sDefaults.putBoolean(KEY_CARRIER_DEFAULT_WFC_IMS_ENABLED_BOOL, false);