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

Commit 5280b420 authored by Jeff Davidson's avatar Jeff Davidson Committed by Android (Google) Code Review
Browse files

Merge "Expose Intent#EXTRA_REASON as a SystemApi."

parents 68eec5cb a0c7d1fb

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -10236,6 +10236,7 @@ package android.content { 
    field public static final java.lang.String EXTRA_PROCESS_TEXT_READONLY = "android.intent.extra.PROCESS_TEXT_READONLY";

    field public static final java.lang.String EXTRA_QUICK_VIEW_FEATURES = "android.intent.extra.QUICK_VIEW_FEATURES";

    field public static final java.lang.String EXTRA_QUIET_MODE = "android.intent.extra.QUIET_MODE";

    field public static final java.lang.String EXTRA_REASON = "android.intent.extra.REASON";

    field public static final java.lang.String EXTRA_REFERRER = "android.intent.extra.REFERRER";

    field public static final java.lang.String EXTRA_REFERRER_NAME = "android.intent.extra.REFERRER_NAME";

    field public static final java.lang.String EXTRA_REMOTE_CALLBACK = "android.intent.extra.REMOTE_CALLBACK";

core/java/android/content/Intent.java

+10 −3
Original line number Diff line number Diff line
@@ -3444,11 +3444,12 @@ public class Intent implements Parcelable, Cloneable { 
    /**

     * A broadcast action to trigger a factory reset.

     *

     * <p> The sender must hold the {@link android.Manifest.permission#MASTER_CLEAR} permission.

     * <p>The sender must hold the {@link android.Manifest.permission#MASTER_CLEAR} permission. The

     * reason for the factory reset should be specified as {@link #EXTRA_REASON}.

     *

     * <p>Not for use by third-party applications.

     *

     * @see #EXTRA_FORCE_MASTER_CLEAR

     * @see #EXTRA_FORCE_FACTORY_RESET

     *

     * {@hide}

     */
@@ -4827,7 +4828,13 @@ public class Intent implements Parcelable, Cloneable { 
    /** @hide */

    public static final int EXTRA_TIME_PREF_VALUE_USE_LOCALE_DEFAULT = 2;



    /** {@hide} */

    /**

     * Intent extra: the reason that the operation associated with this intent is being performed.

     *

     * <p>Type: String

     * @hide

     */

    @SystemApi

    public static final String EXTRA_REASON = "android.intent.extra.REASON";



    /**