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

Commit 47af6876 authored by Russell Brenner's avatar Russell Brenner Committed by android-build-merger
Browse files

Merge "Add hidden SystemApi for two setup wizard actions" into oc-dev 

am: 27ce8b0d

Change-Id: If690b190990b1ca49a5efbc1994b8b09b332630e
parents 163cdf2f 27ce8b0d

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -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";

core/java/android/content/Intent.java

+15 −0
Original line number Diff line number Diff line
@@ -1436,6 +1436,20 @@ public class Intent implements Parcelable, Cloneable { 
    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    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,
@@ -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";