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

Merge "Add "from" extra for ACTION_TOGGLE_SUBSCRIPTION_PRIVILEGED"

Browse Source 
am: 9a1888ce62

Change-Id: I342884174fbaaa13b0973038f6cb70258ba436d7
This commit is contained in:
Patrick Huang
2019-03-21 16:51:05 -07:00
committed by android-build-merger
parent 653b7f6059 9a1888ce62
commit e41be2c876
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -6689,6 +6689,7 @@ package android.telephony.euicc {
field public static final int EUICC_OTA_SUCCEEDED = 3; // 0x3 field public static final int EUICC_OTA_SUCCEEDED = 3; // 0x3
field public static final String EXTRA_EMBEDDED_SUBSCRIPTION_DOWNLOADABLE_SUBSCRIPTIONS = "android.telephony.euicc.extra.EMBEDDED_SUBSCRIPTION_DOWNLOADABLE_SUBSCRIPTIONS"; field public static final String EXTRA_EMBEDDED_SUBSCRIPTION_DOWNLOADABLE_SUBSCRIPTIONS = "android.telephony.euicc.extra.EMBEDDED_SUBSCRIPTION_DOWNLOADABLE_SUBSCRIPTIONS";
field public static final String EXTRA_ENABLE_SUBSCRIPTION = "android.telephony.euicc.extra.ENABLE_SUBSCRIPTION"; field public static final String EXTRA_ENABLE_SUBSCRIPTION = "android.telephony.euicc.extra.ENABLE_SUBSCRIPTION";
field public static final String EXTRA_FROM_SUBSCRIPTION_ID = "android.telephony.euicc.extra.FROM_SUBSCRIPTION_ID";
field public static final String EXTRA_SUBSCRIPTION_ID = "android.telephony.euicc.extra.SUBSCRIPTION_ID"; field public static final String EXTRA_SUBSCRIPTION_ID = "android.telephony.euicc.extra.SUBSCRIPTION_ID";
field public static final String EXTRA_SUBSCRIPTION_NICKNAME = "android.telephony.euicc.extra.SUBSCRIPTION_NICKNAME"; field public static final String EXTRA_SUBSCRIPTION_NICKNAME = "android.telephony.euicc.extra.SUBSCRIPTION_NICKNAME";
} }

24
telephony/java/android/telephony/euicc/EuiccManager.java
View File

@@ -119,9 +119,9 @@ public class EuiccManager {
/** /**
* Intent action sent by system apps (such as the Settings app) to the Telephony framework to * Intent action sent by system apps (such as the Settings app) to the Telephony framework to
* enable or disable a subscription. Must be accompanied with {@link #EXTRA_SUBSCRIPTION_ID} and * enable or disable a subscription. Must be accompanied with {@link #EXTRA_SUBSCRIPTION_ID} and
* {@link #EXTRA_ENABLE_SUBSCRIPTION}. * {@link #EXTRA_ENABLE_SUBSCRIPTION}, and optionally {@link #EXTRA_FROM_SUBSCRIPTION_ID}.
* *
* Requires the caller to be a privileged process with the * <p>Requires the caller to be a privileged process with the
* {@link android.permission#CALL_PRIVILEGED} permission for the intent to reach the Telephony * {@link android.permission#CALL_PRIVILEGED} permission for the intent to reach the Telephony
* stack. * stack.
* *
@@ -144,7 +144,7 @@ public class EuiccManager {
* Intent action sent by system apps (such as the Settings app) to the Telephony framework to * Intent action sent by system apps (such as the Settings app) to the Telephony framework to
* delete a subscription. Must be accompanied with {@link #EXTRA_SUBSCRIPTION_ID}. * delete a subscription. Must be accompanied with {@link #EXTRA_SUBSCRIPTION_ID}.
* *
* Requires the caller to be a privileged process with the * <p>Requires the caller to be a privileged process with the
* {@link android.permission#CALL_PRIVILEGED} permission for the intent to reach the Telephony * {@link android.permission#CALL_PRIVILEGED} permission for the intent to reach the Telephony
* stack. * stack.
* *
@@ -168,7 +168,7 @@ public class EuiccManager {
* rename a subscription. Must be accompanied with {@link #EXTRA_SUBSCRIPTION_ID} and * rename a subscription. Must be accompanied with {@link #EXTRA_SUBSCRIPTION_ID} and
* {@link #EXTRA_SUBSCRIPTION_NICKNAME}. * {@link #EXTRA_SUBSCRIPTION_NICKNAME}.
* *
* Requires the caller to be a privileged process with the * <p>Requires the caller to be a privileged process with the
* {@link android.permission#CALL_PRIVILEGED} permission for the intent to reach the Telephony * {@link android.permission#CALL_PRIVILEGED} permission for the intent to reach the Telephony
* stack. * stack.
* *
@@ -304,6 +304,22 @@ public class EuiccManager {
public static final String EXTRA_SUBSCRIPTION_NICKNAME = public static final String EXTRA_SUBSCRIPTION_NICKNAME =
"android.telephony.euicc.extra.SUBSCRIPTION_NICKNAME"; "android.telephony.euicc.extra.SUBSCRIPTION_NICKNAME";
/**
* Key for an extra set on {@link #ACTION_TOGGLE_SUBSCRIPTION_PRIVILEGED} providing the ID of
* the subscription we're toggling from. This extra is optional and is only used for UI
* purposes by the underlying eUICC service (i.e. the LPA app), such as displaying a dialog
* titled "Switch X with Y". If set, the provided subscription will be used as the "from"
* subscription in UI (the "X" in the dialog example). Otherwise, the currently active
* subscription that will be disabled is the "from" subscription.
*
* <p>Expected type of the extra data: int
*
* @hide
*/
@SystemApi
public static final String EXTRA_FROM_SUBSCRIPTION_ID =
"android.telephony.euicc.extra.FROM_SUBSCRIPTION_ID";
/** /**
* Optional meta-data attribute for a carrier app providing an icon to use to represent the * Optional meta-data attribute for a carrier app providing an icon to use to represent the
* carrier. If not provided, the app's launcher icon will be used as a fallback. * carrier. If not provided, the app's launcher icon will be used as a fallback.