From 6a5ac3b922a3db9d5f00836f4c5323dded54e63e Mon Sep 17 00:00:00 2001 From: fionaxu Date: Fri, 17 Feb 2017 17:20:46 -0800 Subject: [PATCH] move ACTION_CARRIER_SETUP intent to public api As per CDD: The "android.*" namespace for intent constants is reserved for public Android API in AOSP. (Whether public to the full SDK, @SystemApi or defined in AOSP support libraries.) ACTION_CARRIER_SETUP intent is generally useful for carrier privileged apps which is unbundled carrier apps, thus move to public APIs Bug: 33679956 Test: Manual Change-Id: I202398f868d35e7e9046e7cc41330a3c26dca0b0 Merged-in: Ie2b5d072406513f04676210d08c43d91623c3cd2 --- api/current.txt | 1 + api/system-current.txt | 1 + api/test-current.txt | 1 + core/java/android/content/Intent.java | 9 +++++++++ .../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 d681689198c95..a0fe08f5b80cd 100644 --- a/api/current.txt +++ b/api/current.txt @@ -8553,6 +8553,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_CLOSE_SYSTEM_DIALOGS = "android.intent.action.CLOSE_SYSTEM_DIALOGS"; field public static final java.lang.String ACTION_CONFIGURATION_CHANGED = "android.intent.action.CONFIGURATION_CHANGED"; diff --git a/api/system-current.txt b/api/system-current.txt index aae122e6635cd..cb4980823d47e 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -8895,6 +8895,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_CLOSE_SYSTEM_DIALOGS = "android.intent.action.CLOSE_SYSTEM_DIALOGS"; field public static final java.lang.String ACTION_CONFIGURATION_CHANGED = "android.intent.action.CONFIGURATION_CHANGED"; diff --git a/api/test-current.txt b/api/test-current.txt index 8d5c50306e3bd..2894c082f2cc3 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -8565,6 +8565,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_CLOSE_SYSTEM_DIALOGS = "android.intent.action.CLOSE_SYSTEM_DIALOGS"; field public static final java.lang.String ACTION_CONFIGURATION_CHANGED = "android.intent.action.CONFIGURATION_CHANGED"; diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index c6aaa48ddad09..b7876d99bcbab 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -1095,6 +1095,15 @@ public class Intent implements Parcelable, Cloneable { @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) public static final String ACTION_SIM_ACTIVATION_REQUEST = "android.intent.action.SIM_ACTIVATION_REQUEST"; + /** + * Activity Action: Main entry point for carrier setup apps. + *

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. *

Input: {@link #getData} is URI describing the target. diff --git a/telephony/java/com/android/internal/telephony/TelephonyIntents.java b/telephony/java/com/android/internal/telephony/TelephonyIntents.java index 2387ba06c3f06..682b6722d29b4 100644 --- a/telephony/java/com/android/internal/telephony/TelephonyIntents.java +++ b/telephony/java/com/android/internal/telephony/TelephonyIntents.java @@ -263,15 +263,6 @@ public class TelephonyIntents { public static final String ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS = "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. - * - *

Callers of this should hold the android.permission.INVOKE_CARRIER_SETUP - * permission.

- */ - public static final String ACTION_CARRIER_SETUP = "android.intent.action.ACTION_CARRIER_SETUP"; - /** *

Broadcast Action: Indicates that the action is forbidden by network. *