diff options
| author | Chen Xu <fionaxu@google.com> | 2017-02-25 01:05:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-02-25 01:05:30 +0000 |
| commit | fcb37ffc606130dd319b91e7761e4b4fa5090876 (patch) | |
| tree | b06cd703554e9e0e91fa38e5552561fbc3320206 /core/java/android | |
| parent | 79faa72eee9bdd88d663623f4a44a9dde3cfa3b0 (diff) | |
| parent | 6a5ac3b922a3db9d5f00836f4c5323dded54e63e (diff) | |
Merge "move ACTION_CARRIER_SETUP intent to public api"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/content/Intent.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index c6aaa48ddad0..b7876d99bcba 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -1096,6 +1096,15 @@ public class Intent implements Parcelable, Cloneable { public static final String ACTION_SIM_ACTIVATION_REQUEST = "android.intent.action.SIM_ACTIVATION_REQUEST"; /** + * Activity Action: Main entry point for carrier setup apps. + * <p>Carrier apps that provide an implementation for this action may be invoked to configure + * carrier service and typically require + * {@link android.telephony.TelephonyManager#hasCarrierPrivileges() carrier privileges} to + * fulfill their duties. + */ + @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) + public static final String ACTION_CARRIER_SETUP = "android.intent.action.CARRIER_SETUP"; + /** * Activity Action: Send a message to someone specified by the data. * <p>Input: {@link #getData} is URI describing the target. * <p>Output: nothing. |