Merge "Move Ims related settings from global setting to subscription db." (5bf5c028) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+24 −6

Original line number	Diff line number	Diff line
		@@ -65,6 +65,7 @@ import android.os.ResultReceiver;
		import android.os.ServiceManager;
		import android.os.UserHandle;
		import android.speech.tts.TextToSpeech;
		import android.telephony.SubscriptionManager;
		import android.text.TextUtils;
		import android.util.AndroidException;
		import android.util.ArrayMap;
		@@ -10077,8 +10078,12 @@ public final class Settings {
		* <p>
		* Type: int (0 for false, 1 for true)
		* @hide
		* @deprecated Use {@link android.telephony.SubscriptionManager#ENHANCED_4G_MODE_ENABLED}
		* instead.
		*/
		public static final String ENHANCED_4G_MODE_ENABLED = "volte_vt_enabled";
		@Deprecated
		public static final String ENHANCED_4G_MODE_ENABLED =
		SubscriptionManager.ENHANCED_4G_MODE_ENABLED;

		/**
		* Whether VT (Video Telephony over IMS) is enabled
		@@ -10086,8 +10091,10 @@ public final class Settings {
		* Type: int (0 for false, 1 for true)
		*
		* @hide
		* @deprecated Use {@link android.telephony.SubscriptionManager#VT_IMS_ENABLED} instead.
		*/
		public static final String VT_IMS_ENABLED = "vt_ims_enabled";
		@Deprecated
		public static final String VT_IMS_ENABLED = SubscriptionManager.VT_IMS_ENABLED;

		/**
		* Whether WFC is enabled
		@@ -10095,8 +10102,10 @@ public final class Settings {
		* Type: int (0 for false, 1 for true)
		*
		* @hide
		* @deprecated Use {@link android.telephony.SubscriptionManager#WFC_IMS_ENABLED} instead.
		*/
		public static final String WFC_IMS_ENABLED = "wfc_ims_enabled";
		@Deprecated
		public static final String WFC_IMS_ENABLED = SubscriptionManager.WFC_IMS_ENABLED;

		/**
		* WFC mode on home/non-roaming network.
		@@ -10104,8 +10113,10 @@ public final class Settings {
		* Type: int - 2=Wi-Fi preferred, 1=Cellular preferred, 0=Wi-Fi only
		*
		* @hide
		* @deprecated Use {@link android.telephony.SubscriptionManager#WFC_IMS_MODE} instead.
		*/
		public static final String WFC_IMS_MODE = "wfc_ims_mode";
		@Deprecated
		public static final String WFC_IMS_MODE = SubscriptionManager.WFC_IMS_MODE;

		/**
		* WFC mode on roaming network.
		@@ -10113,8 +10124,11 @@ public final class Settings {
		* Type: int - see {@link #WFC_IMS_MODE} for values
		*
		* @hide
		* @deprecated Use {@link android.telephony.SubscriptionManager#WFC_IMS_ROAMING_MODE}
		* instead.
		*/
		public static final String WFC_IMS_ROAMING_MODE = "wfc_ims_roaming_mode";
		@Deprecated
		public static final String WFC_IMS_ROAMING_MODE = SubscriptionManager.WFC_IMS_ROAMING_MODE;

		/**
		* Whether WFC roaming is enabled
		@@ -10122,8 +10136,12 @@ public final class Settings {
		* Type: int (0 for false, 1 for true)
		*
		* @hide
		* @deprecated Use {@link android.telephony.SubscriptionManager#WFC_IMS_ROAMING_ENABLED}
		* instead
		*/
		public static final String WFC_IMS_ROAMING_ENABLED = "wfc_ims_roaming_enabled";
		@Deprecated
		public static final String WFC_IMS_ROAMING_ENABLED =
		SubscriptionManager.WFC_IMS_ROAMING_ENABLED;

		/**
		* Whether user can enable/disable LTE as a preferred network. A carrier might control

telephony/java/android/telephony/SubscriptionManager.java

+36 −0

Original line number	Diff line number	Diff line
		@@ -360,6 +360,42 @@ public class SubscriptionManager {
		*/
		public static final String CB_OPT_OUT_DIALOG = "show_cmas_opt_out_dialog";

		/**
		* TelephonyProvider column name for enable Volte.
		*@hide
		*/
		public static final String ENHANCED_4G_MODE_ENABLED = "volte_vt_enabled";

		/**
		* TelephonyProvider column name for enable VT (Video Telephony over IMS)
		*@hide
		*/
		public static final String VT_IMS_ENABLED = "vt_ims_enabled";

		/**
		* TelephonyProvider column name for enable Wifi calling
		*@hide
		*/
		public static final String WFC_IMS_ENABLED = "wfc_ims_enabled";

		/**
		* TelephonyProvider column name for Wifi calling mode
		*@hide
		*/
		public static final String WFC_IMS_MODE = "wfc_ims_mode";

		/**
		* TelephonyProvider column name for Wifi calling mode in roaming
		*@hide
		*/
		public static final String WFC_IMS_ROAMING_MODE = "wfc_ims_roaming_mode";

		/**
		* TelephonyProvider column name for enable Wifi calling in roaming
		*@hide
		*/
		public static final String WFC_IMS_ROAMING_ENABLED = "wfc_ims_roaming_enabled";

		/**
		* Broadcast Action: The user has changed one of the default subs related to
		* data, phone calls, or sms</p>