Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix descriptions for default SIM in global preferences" am: eeeb74a093

Browse Source 
am: f87866ba9f

Change-Id: I93c5b77138ce7b23e27371a7be15f00e25b987e1
This commit is contained in:
Amit Mahajan
2019-09-17 10:43:02 -07:00
committed by android-build-merger
parent bf6df9ed52 f87866ba9f
commit fd8765b95e
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/provider/Settings.java
View File

@@ -14363,8 +14363,7 @@ public final class Settings {
} }
/** /**
* Subscription to be used for voice call on a multi sim device. The supported values * Subscription Id to be used for voice call on a multi sim device.
* are 0 = SUB1, 1 = SUB2 and etc.
* @hide * @hide
*/ */
public static final String MULTI_SIM_VOICE_CALL_SUBSCRIPTION = "multi_sim_voice_call"; public static final String MULTI_SIM_VOICE_CALL_SUBSCRIPTION = "multi_sim_voice_call";
@@ -14378,15 +14377,13 @@ public final class Settings {
public static final String MULTI_SIM_VOICE_PROMPT = "multi_sim_voice_prompt"; 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 * Subscription Id to be used for data call on a multi sim device.
* are 0 = SUB1, 1 = SUB2 and etc.
* @hide * @hide
*/ */
public static final String MULTI_SIM_DATA_CALL_SUBSCRIPTION = "multi_sim_data_call"; 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 * Subscription Id to be used for SMS on a multi sim device.
* are 0 = SUB1, 1 = SUB2 and etc.
* @hide * @hide
*/ */
public static final String MULTI_SIM_SMS_SUBSCRIPTION = "multi_sim_sms"; public static final String MULTI_SIM_SMS_SUBSCRIPTION = "multi_sim_sms";