Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ac0d271 authored Apr 01, 2017 by TreeHugger Robot Committed by Android (Google) Code Review Apr 01, 2017

Merge "Add hidden SystemApi for two setup wizard actions"

parents e4721299 4cd32e53

api/system-current.txt

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -9775,6 +9775,7 @@ package android.content {
	field public static final java.lang.String ACTION_DATE_CHANGED = "android.intent.action.DATE_CHANGED";		field public static final java.lang.String ACTION_DATE_CHANGED = "android.intent.action.DATE_CHANGED";
	field public static final java.lang.String ACTION_DEFAULT = "android.intent.action.VIEW";		field public static final java.lang.String ACTION_DEFAULT = "android.intent.action.VIEW";
	field public static final java.lang.String ACTION_DELETE = "android.intent.action.DELETE";		field public static final java.lang.String ACTION_DELETE = "android.intent.action.DELETE";
			field public static final deprecated java.lang.String ACTION_DEVICE_INITIALIZATION_WIZARD = "android.intent.action.DEVICE_INITIALIZATION_WIZARD";
	field public static final deprecated java.lang.String ACTION_DEVICE_STORAGE_LOW = "android.intent.action.DEVICE_STORAGE_LOW";		field public static final deprecated java.lang.String ACTION_DEVICE_STORAGE_LOW = "android.intent.action.DEVICE_STORAGE_LOW";
	field public static final deprecated java.lang.String ACTION_DEVICE_STORAGE_OK = "android.intent.action.DEVICE_STORAGE_OK";		field public static final deprecated java.lang.String ACTION_DEVICE_STORAGE_OK = "android.intent.action.DEVICE_STORAGE_OK";
	field public static final java.lang.String ACTION_DIAL = "android.intent.action.DIAL";		field public static final java.lang.String ACTION_DIAL = "android.intent.action.DIAL";
	@@ -9875,6 +9876,7 @@ package android.content {
	field public static final deprecated java.lang.String ACTION_UMS_CONNECTED = "android.intent.action.UMS_CONNECTED";		field public static final deprecated java.lang.String ACTION_UMS_CONNECTED = "android.intent.action.UMS_CONNECTED";
	field public static final deprecated java.lang.String ACTION_UMS_DISCONNECTED = "android.intent.action.UMS_DISCONNECTED";		field public static final deprecated java.lang.String ACTION_UMS_DISCONNECTED = "android.intent.action.UMS_DISCONNECTED";
	field public static final java.lang.String ACTION_UNINSTALL_PACKAGE = "android.intent.action.UNINSTALL_PACKAGE";		field public static final java.lang.String ACTION_UNINSTALL_PACKAGE = "android.intent.action.UNINSTALL_PACKAGE";
			field public static final java.lang.String ACTION_UPGRADE_SETUP = "android.intent.action.UPGRADE_SETUP";
	field public static final java.lang.String ACTION_USER_BACKGROUND = "android.intent.action.USER_BACKGROUND";		field public static final java.lang.String ACTION_USER_BACKGROUND = "android.intent.action.USER_BACKGROUND";
	field public static final java.lang.String ACTION_USER_FOREGROUND = "android.intent.action.USER_FOREGROUND";		field public static final java.lang.String ACTION_USER_FOREGROUND = "android.intent.action.USER_FOREGROUND";
	field public static final java.lang.String ACTION_USER_INITIALIZE = "android.intent.action.USER_INITIALIZE";		field public static final java.lang.String ACTION_USER_INITIALIZE = "android.intent.action.USER_INITIALIZE";

core/java/android/content/Intent.java

+15 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1433,6 +1433,20 @@ public class Intent implements Parcelable, Cloneable {
	@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)		@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
	public static final String ACTION_POWER_USAGE_SUMMARY = "android.intent.action.POWER_USAGE_SUMMARY";		public static final String ACTION_POWER_USAGE_SUMMARY = "android.intent.action.POWER_USAGE_SUMMARY";

			/**
			* Activity Action: Setup wizard action provided for OTA provisioning to determine if it needs
			* to run.
			* <p>Input: Nothing.
			* <p>Output: Nothing.
			* @deprecated As of {@link android.os.Build.VERSION_CODES#M}, setup wizard can be identified
			* using {@link #ACTION_MAIN} and {@link #CATEGORY_SETUP_WIZARD}
			* @hide
			*/
			@Deprecated
			@SystemApi
			public static final String ACTION_DEVICE_INITIALIZATION_WIZARD =
			"android.intent.action.DEVICE_INITIALIZATION_WIZARD";

	/**		/**
	* Activity Action: Setup wizard to launch after a platform update. This		* Activity Action: Setup wizard to launch after a platform update. This
	* activity should have a string meta-data field associated with it,		* activity should have a string meta-data field associated with it,
	@@ -1444,6 +1458,7 @@ public class Intent implements Parcelable, Cloneable {
	* <p>Output: Nothing.		* <p>Output: Nothing.
	* @hide		* @hide
	*/		*/
			@SystemApi
	@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)		@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
	public static final String ACTION_UPGRADE_SETUP = "android.intent.action.UPGRADE_SETUP";		public static final String ACTION_UPGRADE_SETUP = "android.intent.action.UPGRADE_SETUP";