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

Commit 4cd32e53 authored Feb 24, 2017 by Russell Brenner

Add hidden SystemApi for two setup wizard actions

ACTION_UPGRADE_SETUP exists as an SdkConstant and is now additionally
tagged as a SystemApi. ACTION_DEVICE_INITIALIZATION_WIZARD is added
as a deprecated SystemApi to appease CTS requirements. Both APIs are
hidden.

Test: cts-tradefed run cts-dev -m CtsSignatureTestCases \
        -t android.signature.cts.IntentTest#shouldNotFindUnexpectedIntents
Bug: 33663899
Change-Id: Ib45afbfcbb9a3d3020f11c8b63fc2bcf6fc447a1

parent ecf23a03

api/system-current.txt

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -9791,6 +9791,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";
	@@ -9891,6 +9892,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
	@@ -1435,6 +1435,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,
	@@ -1446,6 +1460,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";