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

move ACTION_SERVICE_STATE to system api

Browse Source 
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_SERVICE_STATE intent is generally useful for system/oem
apps thus move to system api

Bug: 33679956
Test: Manual
Change-Id: Ie38b53f077e8a013351d35387f9133e0ebb26cc9
This commit is contained in:
fionaxu
2017-03-31 12:45:12 -07:00
parent b43a5305bd
commit 90fee27577
3 changed files with 280 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
api/system-current.txt
View File

@@ -9877,6 +9877,7 @@ package android.content {
field public static final java.lang.String ACTION_SEND = "android.intent.action.SEND";
field public static final java.lang.String ACTION_SENDTO = "android.intent.action.SENDTO";
field public static final java.lang.String ACTION_SEND_MULTIPLE = "android.intent.action.SEND_MULTIPLE";
field public static final deprecated java.lang.String ACTION_SERVICE_STATE = "android.intent.action.SERVICE_STATE";
field public static final java.lang.String ACTION_SET_WALLPAPER = "android.intent.action.SET_WALLPAPER";
field public static final java.lang.String ACTION_SHOW_APP_INFO = "android.intent.action.SHOW_APP_INFO";
field public static final java.lang.String ACTION_SHUTDOWN = "android.intent.action.ACTION_SHUTDOWN";
@@ -9951,6 +9952,8 @@ package android.content {
field public static final java.lang.String EXTRA_BCC = "android.intent.extra.BCC";
field public static final java.lang.String EXTRA_BUG_REPORT = "android.intent.extra.BUG_REPORT";
field public static final java.lang.String EXTRA_CC = "android.intent.extra.CC";
field public static final deprecated java.lang.String EXTRA_CDMA_DEFAULT_ROAMING_INDICATOR = "cdmaDefaultRoamingIndicator";
field public static final deprecated java.lang.String EXTRA_CDMA_ROAMING_INDICATOR = "cdmaRoamingIndicator";
field public static final deprecated java.lang.String EXTRA_CHANGED_COMPONENT_NAME = "android.intent.extra.changed_component_name";
field public static final java.lang.String EXTRA_CHANGED_COMPONENT_NAME_LIST = "android.intent.extra.changed_component_name_list";
field public static final java.lang.String EXTRA_CHANGED_PACKAGE_LIST = "android.intent.extra.changed_package_list";
@@ -9960,7 +9963,14 @@ package android.content {
field public static final java.lang.String EXTRA_CHOSEN_COMPONENT = "android.intent.extra.CHOSEN_COMPONENT";
field public static final java.lang.String EXTRA_CHOSEN_COMPONENT_INTENT_SENDER = "android.intent.extra.CHOSEN_COMPONENT_INTENT_SENDER";
field public static final java.lang.String EXTRA_CONTENT_ANNOTATIONS = "android.intent.extra.CONTENT_ANNOTATIONS";
field public static final deprecated java.lang.String EXTRA_CSS_INDICATOR = "cssIndicator";
field public static final deprecated java.lang.String EXTRA_DATA_OPERATOR_ALPHA_LONG = "data-operator-alpha-long";
field public static final deprecated java.lang.String EXTRA_DATA_OPERATOR_ALPHA_SHORT = "data-operator-alpha-short";
field public static final deprecated java.lang.String EXTRA_DATA_OPERATOR_NUMERIC = "data-operator-numeric";
field public static final deprecated java.lang.String EXTRA_DATA_RADIO_TECH = "dataRadioTechnology";
field public static final deprecated java.lang.String EXTRA_DATA_REG_STATE = "dataRegState";
field public static final java.lang.String EXTRA_DATA_REMOVED = "android.intent.extra.DATA_REMOVED";
field public static final deprecated java.lang.String EXTRA_DATA_ROAMING_TYPE = "dataRoamingType";
field public static final java.lang.String EXTRA_DOCK_STATE = "android.intent.extra.DOCK_STATE";
field public static final int EXTRA_DOCK_STATE_CAR = 2; // 0x2
field public static final int EXTRA_DOCK_STATE_DESK = 1; // 0x1
@@ -9969,6 +9979,7 @@ package android.content {
field public static final int EXTRA_DOCK_STATE_UNDOCKED = 0; // 0x0
field public static final java.lang.String EXTRA_DONT_KILL_APP = "android.intent.extra.DONT_KILL_APP";
field public static final java.lang.String EXTRA_EMAIL = "android.intent.extra.EMAIL";
field public static final deprecated java.lang.String EXTRA_EMERGENCY_ONLY = "emergencyOnly";
field public static final java.lang.String EXTRA_EXCLUDE_COMPONENTS = "android.intent.extra.EXCLUDE_COMPONENTS";
field public static final java.lang.String EXTRA_FORCE_FACTORY_RESET = "android.intent.extra.FORCE_FACTORY_RESET";
field public static final java.lang.String EXTRA_HTML_TEXT = "android.intent.extra.HTML_TEXT";
@@ -9976,10 +9987,18 @@ package android.content {
field public static final java.lang.String EXTRA_INITIAL_INTENTS = "android.intent.extra.INITIAL_INTENTS";
field public static final java.lang.String EXTRA_INSTALLER_PACKAGE_NAME = "android.intent.extra.INSTALLER_PACKAGE_NAME";
field public static final java.lang.String EXTRA_INTENT = "android.intent.extra.INTENT";
field public static final deprecated java.lang.String EXTRA_IS_DATA_ROAMING_FROM_REGISTRATION = "isDataRoamingFromRegistration";
field public static final deprecated java.lang.String EXTRA_IS_USING_CARRIER_AGGREGATION = "isUsingCarrierAggregation";
field public static final java.lang.String EXTRA_KEY_EVENT = "android.intent.extra.KEY_EVENT";
field public static final java.lang.String EXTRA_LOCAL_ONLY = "android.intent.extra.LOCAL_ONLY";
field public static final deprecated java.lang.String EXTRA_LTE_EARFCN_RSRP_BOOST = "LteEarfcnRsrpBoost";
field public static final deprecated java.lang.String EXTRA_MANUAL = "manual";
field public static final java.lang.String EXTRA_MIME_TYPES = "android.intent.extra.MIME_TYPES";
field public static final deprecated java.lang.String EXTRA_NETWORK_ID = "networkId";
field public static final java.lang.String EXTRA_NOT_UNKNOWN_SOURCE = "android.intent.extra.NOT_UNKNOWN_SOURCE";
field public static final deprecated java.lang.String EXTRA_OPERATOR_ALPHA_LONG = "operator-alpha-long";
field public static final deprecated java.lang.String EXTRA_OPERATOR_ALPHA_SHORT = "operator-alpha-short";
field public static final deprecated java.lang.String EXTRA_OPERATOR_NUMERIC = "operator-numeric";
field public static final java.lang.String EXTRA_ORIGINATING_UID = "android.intent.extra.ORIGINATING_UID";
field public static final java.lang.String EXTRA_ORIGINATING_URI = "android.intent.extra.ORIGINATING_URI";
field public static final java.lang.String EXTRA_PACKAGES = "android.intent.extra.PACKAGES";
@@ -10011,11 +10030,15 @@ package android.content {
field public static final java.lang.String EXTRA_STREAM = "android.intent.extra.STREAM";
field public static final java.lang.String EXTRA_SUBJECT = "android.intent.extra.SUBJECT";
field public static final java.lang.String EXTRA_SUBSCRIPTION_INDEX = "android.intent.extra.SUBSCRIPTION_INDEX";
field public static final deprecated java.lang.String EXTRA_SYSTEM_ID = "systemId";
field public static final java.lang.String EXTRA_TEMPLATE = "android.intent.extra.TEMPLATE";
field public static final java.lang.String EXTRA_TEXT = "android.intent.extra.TEXT";
field public static final java.lang.String EXTRA_TITLE = "android.intent.extra.TITLE";
field public static final java.lang.String EXTRA_UID = "android.intent.extra.UID";
field public static final java.lang.String EXTRA_USER = "android.intent.extra.USER";
field public static final deprecated java.lang.String EXTRA_VOICE_RADIO_TECH = "radioTechnology";
field public static final deprecated java.lang.String EXTRA_VOICE_REG_STATE = "voiceRegState";
field public static final deprecated java.lang.String EXTRA_VOICE_ROAMING_TYPE = "voiceRoamingType";
field public static final int FILL_IN_ACTION = 1; // 0x1
field public static final int FILL_IN_CATEGORIES = 4; // 0x4
field public static final int FILL_IN_CLIP_DATA = 128; // 0x80

255
core/java/android/content/Intent.java
View File

@@ -3478,6 +3478,261 @@ public class Intent implements Parcelable, Cloneable {
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String ACTION_SIM_STATE_CHANGED = "android.intent.action.SIM_STATE_CHANGED";
/**
* Broadcast Action: indicate that the phone service state has changed.
* The intent will have the following extra values:</p>
* <p>
* @see #EXTRA_VOICE_REG_STATE
* @see #EXTRA_DATA_REG_STATE
* @see #EXTRA_VOICE_ROAMING_TYPE
* @see #EXTRA_DATA_ROAMING_TYPE
* @see #EXTRA_OPERATOR_ALPHA_LONG
* @see #EXTRA_OPERATOR_ALPHA_SHORT
* @see #EXTRA_OPERATOR_NUMERIC
* @see #EXTRA_DATA_OPERATOR_ALPHA_LONG
* @see #EXTRA_DATA_OPERATOR_ALPHA_SHORT
* @see #EXTRA_DATA_OPERATOR_NUMERIC
* @see #EXTRA_MANUAL
* @see #EXTRA_VOICE_RADIO_TECH
* @see #EXTRA_DATA_RADIO_TECH
* @see #EXTRA_CSS_INDICATOR
* @see #EXTRA_NETWORK_ID
* @see #EXTRA_SYSTEM_ID
* @see #EXTRA_CDMA_ROAMING_INDICATOR
* @see #EXTRA_CDMA_DEFAULT_ROAMING_INDICATOR
* @see #EXTRA_EMERGENCY_ONLY
* @see #EXTRA_IS_DATA_ROAMING_FROM_REGISTRATION
* @see #EXTRA_IS_USING_CARRIER_AGGREGATION
* @see #EXTRA_LTE_EARFCN_RSRP_BOOST
*
* <p class="note">
* Requires the READ_PHONE_STATE permission.
*
* <p class="note">This is a protected intent that can only be sent by the system.
* @hide
*/
@Deprecated
@SystemApi
@SdkConstant(SdkConstant.SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String ACTION_SERVICE_STATE = "android.intent.action.SERVICE_STATE";
/**
* An int extra used with {@link #ACTION_SERVICE_STATE} which indicates voice registration
* state.
* @see android.telephony.ServiceState#STATE_EMERGENCY_ONLY
* @see android.telephony.ServiceState#STATE_IN_SERVICE
* @see android.telephony.ServiceState#STATE_OUT_OF_SERVICE
* @see android.telephony.ServiceState#STATE_POWER_OFF
* @hide
*/
@Deprecated
@SystemApi
public static final String EXTRA_VOICE_REG_STATE = "voiceRegState";
/**
* An int extra used with {@link #ACTION_SERVICE_STATE} which indicates data registration state.
* @see android.telephony.ServiceState#STATE_EMERGENCY_ONLY
* @see android.telephony.ServiceState#STATE_IN_SERVICE
* @see android.telephony.ServiceState#STATE_OUT_OF_SERVICE
* @see android.telephony.ServiceState#STATE_POWER_OFF
* @hide
*/
@Deprecated
@SystemApi
public static final String EXTRA_DATA_REG_STATE = "dataRegState";
/**
* An integer extra used with {@link #ACTION_SERVICE_STATE} which indicates the voice roaming
* type.
* @hide
*/
@Deprecated
@SystemApi
public static final String EXTRA_VOICE_ROAMING_TYPE = "voiceRoamingType";
/**
* An integer extra used with {@link #ACTION_SERVICE_STATE} which indicates the data roaming
* type.
* @hide
*/
@Deprecated
@SystemApi
public static final String EXTRA_DATA_ROAMING_TYPE = "dataRoamingType";
/**
* A string extra used with {@link #ACTION_SERVICE_STATE} which represents the current
* registered voice operator name in long alphanumeric format.
* {@code null} if the operator name is not known or unregistered.
* @hide
*/
@Deprecated
@SystemApi
public static final String EXTRA_OPERATOR_ALPHA_LONG = "operator-alpha-long";
/**
* A string extra used with {@link #ACTION_SERVICE_STATE} which represents the current
* registered voice operator name in short alphanumeric format.
* {@code null} if the operator name is not known or unregistered.
* @hide
*/
@Deprecated
@SystemApi
public static final String EXTRA_OPERATOR_ALPHA_SHORT = "operator-alpha-short";
/**
* A string extra used with {@link #ACTION_SERVICE_STATE} containing the MCC
* (Mobile Country Code, 3 digits) and MNC (Mobile Network code, 2-3 digits) for the mobile
* network.
* @hide
*/
@Deprecated
@SystemApi
public static final String EXTRA_OPERATOR_NUMERIC = "operator-numeric";
/**
* A string extra used with {@link #ACTION_SERVICE_STATE} which represents the current
* registered data operator name in long alphanumeric format.
* {@code null} if the operator name is not known or unregistered.
* @hide
*/
@Deprecated
@SystemApi
public static final String EXTRA_DATA_OPERATOR_ALPHA_LONG = "data-operator-alpha-long";
/**
* A string extra used with {@link #ACTION_SERVICE_STATE} which represents the current
* registered data operator name in short alphanumeric format.
* {@code null} if the operator name is not known or unregistered.
* @hide
*/
@Deprecated
@SystemApi
public static final String EXTRA_DATA_OPERATOR_ALPHA_SHORT = "data-operator-alpha-short";
/**
* A string extra used with {@link #ACTION_SERVICE_STATE} containing the MCC
* (Mobile Country Code, 3 digits) and MNC (Mobile Network code, 2-3 digits) for the
* data operator.
* @hide
*/
@Deprecated
@SystemApi
public static final String EXTRA_DATA_OPERATOR_NUMERIC = "data-operator-numeric";
/**
* A boolean extra used with {@link #ACTION_SERVICE_STATE} which indicates whether the current
* network selection mode is manual.
* Will be {@code true} if manual mode, {@code false} if automatic mode.
* @hide
*/
@Deprecated
@SystemApi
public static final String EXTRA_MANUAL = "manual";
/**
* An integer extra used with {@link #ACTION_SERVICE_STATE} which represents the current voice
* radio technology.
* @hide
*/
@Deprecated
@SystemApi
public static final String EXTRA_VOICE_RADIO_TECH = "radioTechnology";
/**
* An integer extra used with {@link #ACTION_SERVICE_STATE} which represents the current data
* radio technology.
* @hide
*/
@Deprecated
@SystemApi
public static final String EXTRA_DATA_RADIO_TECH = "dataRadioTechnology";
/**
* A boolean extra used with {@link #ACTION_SERVICE_STATE} which represents concurrent service
* support on CDMA network.
* Will be {@code true} if support, {@code false} otherwise.
* @hide
*/
@Deprecated
@SystemApi
public static final String EXTRA_CSS_INDICATOR = "cssIndicator";
/**
* An integer extra used with {@link #ACTION_SERVICE_STATE} which represents the CDMA network
* id. {@code Integer.MAX_VALUE} if unknown.
* @hide
*/
@Deprecated
@SystemApi
public static final String EXTRA_NETWORK_ID = "networkId";
/**
* An integer extra used with {@link #ACTION_SERVICE_STATE} which represents the CDMA system id.
* {@code Integer.MAX_VALUE} if unknown.
* @hide
*/
@Deprecated
@SystemApi
public static final String EXTRA_SYSTEM_ID = "systemId";
/**
* An integer extra used with {@link #ACTION_SERVICE_STATE} represents the TSB-58 roaming
* indicator if registered on a CDMA or EVDO system or {@code -1} if not.
* @hide
*/
@Deprecated
@SystemApi
public static final String EXTRA_CDMA_ROAMING_INDICATOR = "cdmaRoamingIndicator";
/**
* An integer extra used with {@link #ACTION_SERVICE_STATE} represents the default roaming
* indicator from the PRL if registered on a CDMA or EVDO system {@code -1} if not.
* @hide
*/
@Deprecated
@SystemApi
public static final String EXTRA_CDMA_DEFAULT_ROAMING_INDICATOR = "cdmaDefaultRoamingIndicator";
/**
* A boolean extra used with {@link #ACTION_SERVICE_STATE} which indicates if under emergency
* only mode.
* {@code true} if in emergency only mode, {@code false} otherwise.
* @hide
*/
@Deprecated
@SystemApi
public static final String EXTRA_EMERGENCY_ONLY = "emergencyOnly";
/**
* A boolean extra used with {@link #ACTION_SERVICE_STATE} which indicates whether data network
* registration state is roaming.
* {@code true} if registration indicates roaming, {@code false} otherwise
* @hide
*/
@Deprecated
@SystemApi
public static final String EXTRA_IS_DATA_ROAMING_FROM_REGISTRATION =
"isDataRoamingFromRegistration";
/**
* A boolean extra used with {@link #ACTION_SERVICE_STATE} which indicates if carrier
* aggregation is in use.
* {@code true} if carrier aggregation is in use, {@code false} otherwise.
* @hide
*/
@Deprecated
@SystemApi
public static final String EXTRA_IS_USING_CARRIER_AGGREGATION = "isUsingCarrierAggregation";
/**
* An integer extra used with {@link #ACTION_SERVICE_STATE} representing the offset which
* is reduced from the rsrp threshold while calculating signal strength level.
* @hide
*/
@Deprecated
@SystemApi
public static final String EXTRA_LTE_EARFCN_RSRP_BOOST = "LteEarfcnRsrpBoost";
/**
* The name of the extra used to define the text to be processed, as a
* CharSequence. Note that this may be a styled CharSequence, so you must use

3
telephony/java/com/android/internal/telephony/TelephonyIntents.java
View File

@@ -53,8 +53,9 @@ public class TelephonyIntents {
*
* <p class="note">This is a protected intent that can only be sent
* by the system.
* @deprecated use {@link Intent#ACTION_SERVICE_STATE}
*/
public static final String ACTION_SERVICE_STATE_CHANGED = "android.intent.action.SERVICE_STATE";
public static final String ACTION_SERVICE_STATE_CHANGED = Intent.ACTION_SERVICE_STATE;
/**
* <p>Broadcast Action: The radio technology has changed. The intent will have the following