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

Commit fd1e0362 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add EXTRA_PERMISSION_GROUP_NAME"

parents 7fe83b90 029aac7d

api/system-current.txt

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

    field public static final java.lang.String EXTRA_PACKAGES = "android.intent.extra.PACKAGES";

    field public static final java.lang.String EXTRA_PERMISSION_NAME = "android.intent.extra.PERMISSION_NAME";

    field public static final java.lang.String EXTRA_PERMISSION_GROUP_NAME = "android.intent.extra.PERMISSION_GROUP_NAME";

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

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

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

core/java/android/content/Intent.java

+20 −1
Original line number Diff line number Diff line
@@ -1952,17 +1952,36 @@ public class Intent implements Parcelable, Cloneable { 
    @SystemApi

    public static final String EXTRA_PERMISSION_NAME = "android.intent.extra.PERMISSION_NAME";



    /**

     * Intent extra: The name of a permission group.

     * <p>

     * Type: String

     * </p>

     *

     * @hide

     */

    @SystemApi

    public static final String EXTRA_PERMISSION_GROUP_NAME =

            "android.intent.extra.PERMISSION_GROUP_NAME";



    /**

     * Activity action: Launch UI to review app uses of permissions.

     * <p>

     * Input: {@link #EXTRA_PERMISSION_NAME} specifies the permission name

     * that will be displayed by the launched UI.

     * that will be displayed by the launched UI.  Do not pass both this and

     * {@link #EXTRA_PERMISSION_GROUP_NAME} .

     * </p>

     * <p>

     * Input: {@link #EXTRA_PERMISSION_GROUP_NAME} specifies the permission group name

     * that will be displayed by the launched UI.  Do not pass both this and

     * {@link #EXTRA_PERMISSION_NAME}.

     * </p>

     * <p>

     * Output: Nothing.

     * </p>

     *

     * @see #EXTRA_PERMISSION_NAME

     * @see #EXTRA_PERMISSION_GROUP_NAME

     *

     * @hide

     */