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 am: f87866ba9f

Browse Source 
am: fd8765b95e

Change-Id: I1ce7fc6f311f9462f1f505ef5387b2416728c794
This commit is contained in:
Amit Mahajan
2019-09-17 10:49:05 -07:00
committed by android-build-merger
parent c72a04529d fd8765b95e
commit 0c8c4978ab
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

@@ -14380,8 +14380,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";
@@ -14395,15 +14394,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";