Merge "Mark some system intents as SystemApi" (24dfce2f) · Commits · e / os / android_frameworks_base

api/system-current.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -9555,6 +9555,7 @@ package android.content {
		field public static final java.lang.String ACTION_MANAGE_PACKAGE_STORAGE = "android.intent.action.MANAGE_PACKAGE_STORAGE";
		field public static final java.lang.String ACTION_MANAGE_PERMISSIONS = "android.intent.action.MANAGE_PERMISSIONS";
		field public static final java.lang.String ACTION_MANAGE_PERMISSION_APPS = "android.intent.action.MANAGE_PERMISSION_APPS";
		field public static final java.lang.String ACTION_MASTER_CLEAR_NOTIFICATION = "android.intent.action.MASTER_CLEAR_NOTIFICATION";
		field public static final java.lang.String ACTION_MEDIA_BAD_REMOVAL = "android.intent.action.MEDIA_BAD_REMOVAL";
		field public static final java.lang.String ACTION_MEDIA_BUTTON = "android.intent.action.MEDIA_BUTTON";
		field public static final java.lang.String ACTION_MEDIA_CHECKING = "android.intent.action.MEDIA_CHECKING";
		@@ -9591,6 +9592,7 @@ package android.content {
		field public static final java.lang.String ACTION_POWER_CONNECTED = "android.intent.action.ACTION_POWER_CONNECTED";
		field public static final java.lang.String ACTION_POWER_DISCONNECTED = "android.intent.action.ACTION_POWER_DISCONNECTED";
		field public static final java.lang.String ACTION_POWER_USAGE_SUMMARY = "android.intent.action.POWER_USAGE_SUMMARY";
		field public static final java.lang.String ACTION_PRE_BOOT_COMPLETED = "android.intent.action.PRE_BOOT_COMPLETED";
		field public static final java.lang.String ACTION_PROCESS_TEXT = "android.intent.action.PROCESS_TEXT";
		field public static final java.lang.String ACTION_PROVIDER_CHANGED = "android.intent.action.PROVIDER_CHANGED";
		field public static final java.lang.String ACTION_QUERY_PACKAGE_RESTART = "android.intent.action.QUERY_PACKAGE_RESTART";
		@@ -9609,6 +9611,7 @@ package android.content {
		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";
		field public static final java.lang.String ACTION_SIM_STATE_CHANGED = "android.intent.action.SIM_STATE_CHANGED";
		field public static final java.lang.String ACTION_SYNC = "android.intent.action.SYNC";
		field public static final java.lang.String ACTION_SYSTEM_TUTORIAL = "android.intent.action.SYSTEM_TUTORIAL";
		field public static final java.lang.String ACTION_TIMEZONE_CHANGED = "android.intent.action.TIMEZONE_CHANGED";

core/java/android/content/Intent.java

+22 −0

Original line number	Diff line number	Diff line
		@@ -2873,6 +2873,7 @@ public class Intent implements Parcelable, Cloneable {
		*
		* @hide
		*/
		@SystemApi
		public static final String ACTION_PRE_BOOT_COMPLETED =
		"android.intent.action.PRE_BOOT_COMPLETED";

		@@ -3312,6 +3313,16 @@ public class Intent implements Parcelable, Cloneable {
		@Deprecated
		public static final String ACTION_MASTER_CLEAR = "android.intent.action.MASTER_CLEAR";

		/**
		* Broadcast intent sent by the RecoverySystem to inform listeners that a master clear (wipe)
		* is about to be performed.
		* @hide
		*/
		@SystemApi
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String ACTION_MASTER_CLEAR_NOTIFICATION
		= "android.intent.action.MASTER_CLEAR_NOTIFICATION";

		/**
		* Boolean intent extra to be used with {@link #ACTION_MASTER_CLEAR} in order to force a factory
		* reset even if {@link android.os.UserManager#DISALLOW_FACTORY_RESET} is set.
		@@ -3384,6 +3395,17 @@ public class Intent implements Parcelable, Cloneable {
		*/
		@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
		public static final String ACTION_PROCESS_TEXT = "android.intent.action.PROCESS_TEXT";

		/**
		* Broadcast Action: The sim card state has changed.
		* For more details see TelephonyIntents.ACTION_SIM_STATE_CHANGED. This is here
		* because TelephonyIntents is an internal class.
		* @hide
		*/
		@SystemApi
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String ACTION_SIM_STATE_CHANGED = "android.intent.action.SIM_STATE_CHANGED";

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

telephony/java/com/android/internal/telephony/TelephonyIntents.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package com.android.internal.telephony;

		import android.content.Intent;

		/**
		* The intents that the telephony services broadcast.
		*
		@@ -184,7 +186,6 @@ public class TelephonyIntents {
		public static final String ACTION_DATA_CONNECTION_FAILED
		= "android.intent.action.DATA_CONNECTION_FAILED";


		/**
		* Broadcast Action: The sim card state has changed.
		* The intent will have the following extra values:</p>
		@@ -213,8 +214,7 @@ public class TelephonyIntents {
		* by the system.
		*/
		public static final String ACTION_SIM_STATE_CHANGED
		= "android.intent.action.SIM_STATE_CHANGED";

		= Intent.ACTION_SIM_STATE_CHANGED;

		/**
		* Broadcast Action: The time was set by the carrier (typically by the NITZ string).