Merge kwd to master
Add initial IMS and MSIM support from klp-wireless-dev-mirror
Change-Id: Idb607c0aa32f80fe4fe1539aedea7a221e9e7f04
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 3fe0fb8..2a5e9fd 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -6547,6 +6547,53 @@
public static boolean putFloat(ContentResolver cr, String name, float value) {
return putString(cr, name, Float.toString(value));
}
+
+
+ /**
+ * Subscription to be used for voice call on a multi sim device. The supported values
+ * are 0 = SUB1, 1 = SUB2 and etc.
+ * @hide
+ */
+ public static final String MULTI_SIM_VOICE_CALL_SUBSCRIPTION = "multi_sim_voice_call";
+
+ /**
+ * Used to provide option to user to select subscription during dial.
+ * The supported values are 0 = disable or 1 = enable prompt.
+ * @hide
+ */
+ 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.
+ * @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.
+ * @hide
+ */
+ public static final String MULTI_SIM_SMS_SUBSCRIPTION = "multi_sim_sms";
+
+ /**
+ * Used to provide option to user to select subscription during send SMS.
+ * The value 1 - enable, 0 - disable
+ * @hide
+ */
+ public static final String MULTI_SIM_SMS_PROMPT = "multi_sim_sms_prompt";
+
+
+
+ /** User preferred subscriptions setting.
+ * This holds the details of the user selected subscription from the card and
+ * the activation status. Each settings string have the coma separated values
+ * iccId,appType,appId,activationStatus,3gppIndex,3gpp2Index
+ * @hide
+ */
+ public static final String[] MULTI_SIM_USER_PREFERRED_SUBS = {"user_preferred_sub1",
+ "user_preferred_sub2","user_preferred_sub3"};
}
/**