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

Merge "Clean up a few names of Telephony intent extra." am: 63bf486921

Browse Source 
am: 2cadf8e9f9

Change-Id: I1026c87f73abc5dccee6c1b5a1747c53e436b5f0
This commit is contained in:
Xiangyu/Malcolm Chen
2019-04-03 16:49:33 -07:00
committed by android-build-merger
parent 47fdabe9fa 2cadf8e9f9
commit 3722b6907f
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -1321,7 +1321,7 @@ public class TelephonyManager {
/**
* An int extra used with {@link #ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED} to indicate the
* subscription which has changed.
* subscription which has changed; or in general whenever a subscription ID needs specified.
*/
public static final String EXTRA_SUBSCRIPTION_ID = "android.telephony.extra.SUBSCRIPTION_ID";
@@ -1428,13 +1428,24 @@ public class TelephonyManager {
/**
* Integer intent extra to be used with {@link #ACTION_PRIMARY_SUBSCRIPTION_LIST_CHANGED}
* to indicate whether a SIM selection is needed to choose default subscription.
* to indicate what type of SIM selection is needed.
*
* @hide
*/
public static final String EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE =
"android.telephony.extra.DEFAULT_SUBSCRIPTION_SELECT_TYPE";
/** @hide */
@IntDef({
EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_NONE,
EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_DATA,
EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_VOICE,
EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_SMS,
EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_ALL
})
@Retention(RetentionPolicy.SOURCE)
public @interface DefaultSubscriptionSelectType{}
/**
* Used as an int value for {@link #EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE}
* to indicate there's no need to re-select any default subscription.
@@ -1466,20 +1477,11 @@ public class TelephonyManager {
/**
* Used as an int value for {@link #EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE}
* to indicate user to decide whether current SIM should be preferred for all
* data / voice / sms.
* data / voice / sms. {@link #EXTRA_SUBSCRIPTION_ID} will specified to indicate
* which subscription should be the default subscription.
* @hide
*/
public static final int EXTRA_DEFAULT_SUBSCRIPTION_SELECT_FOR_ALL_TYPES = 4;
/**
* Integer intent extra to be used with
* {@link #EXTRA_DEFAULT_SUBSCRIPTION_SELECT_FOR_ALL_TYPES}
* to indicate which SIM is being selected.
*
* @hide
*/
public static final String EXTRA_DEFAULT_SUBSCRIPTION_ID =
"android.telephony.extra.DEFAULT_SUBSCRIPTION_ID";
public static final int EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_ALL = 4;
//
//