Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c8c4978 authored by Amit Mahajan's avatar Amit Mahajan Committed by android-build-merger
Browse files

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

am: fd8765b9

Change-Id: I1ce7fc6f311f9462f1f505ef5387b2416728c794
parents c72a0452 fd8765b9

core/java/android/provider/Settings.java

+3 −6
Original line number Diff line number Diff line
@@ -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";