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

Commit 65ce8c0b authored by Sumit Bhagwani's avatar Sumit Bhagwani Committed by Android (Google) Code Review
Browse files

Merge "Adding Intent Extra for subattribution."

parents 0c5fa890 7943e9c7

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -2437,6 +2437,7 @@ package android.content { 
    field public static final String EXTRA_REMOTE_CALLBACK = "android.intent.extra.REMOTE_CALLBACK";

    field public static final String EXTRA_RESULT_NEEDED = "android.intent.extra.RESULT_NEEDED";

    field public static final String EXTRA_ROLE_NAME = "android.intent.extra.ROLE_NAME";

    field public static final String EXTRA_SHOWING_ATTRIBUTION = "android.intent.extra.SHOWING_ATTRIBUTION";

    field public static final String EXTRA_UNKNOWN_INSTANT_APP = "android.intent.extra.UNKNOWN_INSTANT_APP";

    field public static final String EXTRA_VERIFICATION_BUNDLE = "android.intent.extra.VERIFICATION_BUNDLE";

    field public static final int FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT = 67108864; // 0x4000000

core/java/android/content/Intent.java

+16 −0
Original line number Diff line number Diff line
@@ -5385,6 +5385,22 @@ public class Intent implements Parcelable, Cloneable { 
     */

    public static final String EXTRA_END_TIME = "android.intent.extra.END_TIME";



    /**

     * A boolean extra, when used with {@link #ACTION_VIEW_PERMISSION_USAGE_FOR_PERIOD},

     * that specifies whether the system displayed attribution information in the

     * permission usage system UI for the chosen entry.

     *

     * <p> The extra can only be true if application has specified attributionsAreUserVisible

     * in its manifest. </p>

     *

     * <p> Applications can use this extra to improve their permission usage explanation

     * experience. </p>

     * @hide

     */

    @SystemApi

    public static final String EXTRA_SHOWING_ATTRIBUTION =

            "android.intent.extra.SHOWING_ATTRIBUTION";



    /**

     * An Intent[] describing additional, alternate choices you would like shown with

     * {@link #ACTION_CHOOSER}.