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

Commit a63bf145 authored by Yi-an Chen's avatar Yi-an Chen Committed by Automerger Merge Worker
Browse files

Merge "Add the intent for showing permission history" into sc-dev am: 27328673 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13856203

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I863995ea2903852f080ac2504656d1ded5ba03fc
parents 67d70ae3 27328673

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -2239,6 +2239,7 @@ package android.content { 
    field @RequiresPermission(android.Manifest.permission.REVIEW_ACCESSIBILITY_SERVICES) public static final String ACTION_REVIEW_ACCESSIBILITY_SERVICES = "android.intent.action.REVIEW_ACCESSIBILITY_SERVICES";

    field @RequiresPermission(android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS) public static final String ACTION_REVIEW_ONGOING_PERMISSION_USAGE = "android.intent.action.REVIEW_ONGOING_PERMISSION_USAGE";

    field public static final String ACTION_REVIEW_PERMISSIONS = "android.intent.action.REVIEW_PERMISSIONS";

    field @RequiresPermission(android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS) public static final String ACTION_REVIEW_PERMISSION_HISTORY = "android.intent.action.REVIEW_PERMISSION_HISTORY";

    field @RequiresPermission(android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS) public static final String ACTION_REVIEW_PERMISSION_USAGE = "android.intent.action.REVIEW_PERMISSION_USAGE";

    field public static final String ACTION_ROLLBACK_COMMITTED = "android.intent.action.ROLLBACK_COMMITTED";

    field public static final String ACTION_SHOW_SUSPENDED_APP_DETAILS = "android.intent.action.SHOW_SUSPENDED_APP_DETAILS";

core/java/android/content/Intent.java

+23 −0
Original line number Diff line number Diff line
@@ -2171,6 +2171,29 @@ public class Intent implements Parcelable, Cloneable { 
    public static final String ACTION_REVIEW_PERMISSION_USAGE =

            "android.intent.action.REVIEW_PERMISSION_USAGE";



    /**

     * Activity action: Launch UI to review the timeline history of permissions.

     * <p>

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

     * that will be displayed by the launched UI.

     * </p>

     * <p>

     * Output: Nothing.

     * </p>

     * <p class="note">

     * This requires {@link android.Manifest.permission#GRANT_RUNTIME_PERMISSIONS} permission.

     * </p>

     *

     * @see #EXTRA_PERMISSION_GROUP_NAME

     *

     * @hide

     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS)

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_REVIEW_PERMISSION_HISTORY =

            "android.intent.action.REVIEW_PERMISSION_HISTORY";



    /**

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

     * <p>