Merge "Merge "Fix descriptions for default SIM in global preferences" am:... (4914ed2a) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+3 −6

Original line number	Diff line number	Diff line
		@@ -12920,8 +12920,7 @@ public final class Settings {
		}

		/**
		* Subscription to be used for voice call on a multi sim device. The supported values
		* are 0 = SUB1, 1 = SUB2 and etc.
		* Subscription Id to be used for voice call on a multi sim device.
		* @hide
		*/
		public static final String MULTI_SIM_VOICE_CALL_SUBSCRIPTION = "multi_sim_voice_call";
		@@ -12935,15 +12934,13 @@ public final class Settings {
		public static final String MULTI_SIM_VOICE_PROMPT = "multi_sim_voice_prompt";

		/**
		* Subscription to be used for data call on a multi sim device. The supported values
		* are 0 = SUB1, 1 = SUB2 and etc.
		* Subscription Id to be used for data call on a multi sim device.
		* @hide
		*/
		public static final String MULTI_SIM_DATA_CALL_SUBSCRIPTION = "multi_sim_data_call";

		/**
		* Subscription to be used for SMS on a multi sim device. The supported values
		* are 0 = SUB1, 1 = SUB2 and etc.
		* Subscription Id to be used for SMS on a multi sim device.
		* @hide
		*/
		public static final String MULTI_SIM_SMS_SUBSCRIPTION = "multi_sim_sms";