Merge "Fix descriptions for default SIM in global preferences"

am: eeeb74a093

Change-Id: Ie4e492062c0c1a91b36abce43fde3506ae2cbc60
This commit is contained in:
Amit Mahajan
2019-09-17 10:31:23 -07:00
committed by android-build-merger

View File

@@ -14343,8 +14343,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";
@@ -14358,15 +14357,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";