diff options
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/content/Intent.java | 15 |
2 files changed, 17 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 7e93205adf1b..e86e328e633d 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -9797,6 +9797,7 @@ package android.content { field public static final java.lang.String ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED = "android.intent.action.ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED"; field public static final java.lang.String ACTION_DEFAULT_SUBSCRIPTION_CHANGED = "android.intent.action.ACTION_DEFAULT_SUBSCRIPTION_CHANGED"; 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_OK = "android.intent.action.DEVICE_STORAGE_OK"; field public static final java.lang.String ACTION_DIAL = "android.intent.action.DIAL"; @@ -9904,6 +9905,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_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_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_FOREGROUND = "android.intent.action.USER_FOREGROUND"; field public static final java.lang.String ACTION_USER_INITIALIZE = "android.intent.action.USER_INITIALIZE"; diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index b382cef39145..a4b5ffd63ae1 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -1437,6 +1437,20 @@ public class Intent implements Parcelable, Cloneable { 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 should have a string meta-data field associated with it, * {@link #METADATA_SETUP_VERSION}, which defines the current version of @@ -1447,6 +1461,7 @@ public class Intent implements Parcelable, Cloneable { * <p>Output: Nothing. * @hide */ + @SystemApi @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) public static final String ACTION_UPGRADE_SETUP = "android.intent.action.UPGRADE_SETUP"; |