diff options
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/content/Intent.java | 9 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/TelephonyIntents.java | 9 |
5 files changed, 12 insertions, 9 deletions
diff --git a/api/current.txt b/api/current.txt index 62365cce20a9..b967febef784 100644 --- a/api/current.txt +++ b/api/current.txt @@ -9041,6 +9041,7 @@ package android.content { field public static final java.lang.String ACTION_CALL = "android.intent.action.CALL"; field public static final java.lang.String ACTION_CALL_BUTTON = "android.intent.action.CALL_BUTTON"; field public static final java.lang.String ACTION_CAMERA_BUTTON = "android.intent.action.CAMERA_BUTTON"; + field public static final java.lang.String ACTION_CARRIER_SETUP = "android.intent.action.CARRIER_SETUP"; field public static final java.lang.String ACTION_CHOOSER = "android.intent.action.CHOOSER"; field public static final java.lang.String ACTION_CLEAR_PACKAGE = "android.intent.action.CLEAR_PACKAGE"; field public static final java.lang.String ACTION_CLOSE_SYSTEM_DIALOGS = "android.intent.action.CLOSE_SYSTEM_DIALOGS"; diff --git a/api/system-current.txt b/api/system-current.txt index 8626f1b33fa4..778548fa7fa1 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -9515,6 +9515,7 @@ package android.content { field public static final java.lang.String ACTION_CALL = "android.intent.action.CALL"; field public static final java.lang.String ACTION_CALL_BUTTON = "android.intent.action.CALL_BUTTON"; field public static final java.lang.String ACTION_CAMERA_BUTTON = "android.intent.action.CAMERA_BUTTON"; + field public static final java.lang.String ACTION_CARRIER_SETUP = "android.intent.action.CARRIER_SETUP"; field public static final java.lang.String ACTION_CHOOSER = "android.intent.action.CHOOSER"; field public static final java.lang.String ACTION_CLEAR_PACKAGE = "android.intent.action.CLEAR_PACKAGE"; field public static final java.lang.String ACTION_CLOSE_SYSTEM_DIALOGS = "android.intent.action.CLOSE_SYSTEM_DIALOGS"; diff --git a/api/test-current.txt b/api/test-current.txt index 44386bec120a..e6b8010afe62 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -9070,6 +9070,7 @@ package android.content { field public static final java.lang.String ACTION_CALL = "android.intent.action.CALL"; field public static final java.lang.String ACTION_CALL_BUTTON = "android.intent.action.CALL_BUTTON"; field public static final java.lang.String ACTION_CAMERA_BUTTON = "android.intent.action.CAMERA_BUTTON"; + field public static final java.lang.String ACTION_CARRIER_SETUP = "android.intent.action.CARRIER_SETUP"; field public static final java.lang.String ACTION_CHOOSER = "android.intent.action.CHOOSER"; field public static final java.lang.String ACTION_CLEAR_PACKAGE = "android.intent.action.CLEAR_PACKAGE"; field public static final java.lang.String ACTION_CLOSE_SYSTEM_DIALOGS = "android.intent.action.CLOSE_SYSTEM_DIALOGS"; diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 28068c54744c..d92dff6d3c59 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -1115,6 +1115,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. diff --git a/telephony/java/com/android/internal/telephony/TelephonyIntents.java b/telephony/java/com/android/internal/telephony/TelephonyIntents.java index d40835ba2f50..dc8dfba806dc 100644 --- a/telephony/java/com/android/internal/telephony/TelephonyIntents.java +++ b/telephony/java/com/android/internal/telephony/TelephonyIntents.java @@ -264,15 +264,6 @@ public class TelephonyIntents { = "android.intent.action.ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS"; /** - * Activity Action: Start this activity to invoke the carrier setup app. - * The carrier app must be signed using a certificate that matches the UICC access rules. - * - * <p class="note">Callers of this should hold the android.permission.INVOKE_CARRIER_SETUP - * permission.</p> - */ - public static final String ACTION_CARRIER_SETUP = "android.intent.action.ACTION_CARRIER_SETUP"; - - /** * <p>Broadcast Action: Indicates that the action is forbidden by network. * <p class="note"> * This is for the OEM applications to understand about possible provisioning issues. |