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

Commit 61ade4cf authored by Nhan Do's avatar Nhan Do Committed by Automerger Merge Worker
Browse files

Merge "Add @RequiresPermission annotation to ACTION_MASTER_CLEAR_NOTIFICATION... 

Merge "Add @RequiresPermission annotation to ACTION_MASTER_CLEAR_NOTIFICATION intent" into main am: 6ffa5876 am: eb6fc93d am: 38b4c18b am: 74b1c1af am: 6cf7848d

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



Change-Id: I4b5a81bde99e7e2f8e398131255be2101c1f5119
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3c46641a 6cf7848d

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -3537,7 +3537,7 @@ package android.content { 
    field public static final String ACTION_MANAGE_PERMISSION_APPS = "android.intent.action.MANAGE_PERMISSION_APPS";

    field @RequiresPermission(android.Manifest.permission.START_VIEW_PERMISSION_USAGE) public static final String ACTION_MANAGE_PERMISSION_USAGE = "android.intent.action.MANAGE_PERMISSION_USAGE";

    field @RequiresPermission(android.Manifest.permission.MANAGE_ROLE_HOLDERS) public static final String ACTION_MANAGE_SPECIAL_APP_ACCESSES = "android.intent.action.MANAGE_SPECIAL_APP_ACCESSES";

    field public static final String ACTION_MASTER_CLEAR_NOTIFICATION = "android.intent.action.MASTER_CLEAR_NOTIFICATION";

    field @RequiresPermission(android.Manifest.permission.MASTER_CLEAR) public static final String ACTION_MASTER_CLEAR_NOTIFICATION = "android.intent.action.MASTER_CLEAR_NOTIFICATION";

    field public static final String ACTION_PACKAGE_NEEDS_INTEGRITY_VERIFICATION = "android.intent.action.PACKAGE_NEEDS_INTEGRITY_VERIFICATION";

    field public static final String ACTION_PACKAGE_UNSUSPENDED_MANUALLY = "android.intent.action.PACKAGE_UNSUSPENDED_MANUALLY";

    field public static final String ACTION_PENDING_INCIDENT_REPORTS_CHANGED = "android.intent.action.PENDING_INCIDENT_REPORTS_CHANGED";

core/java/android/content/Intent.java

+1 −0
Original line number Diff line number Diff line
@@ -4447,6 +4447,7 @@ public class Intent implements Parcelable, Cloneable { 
     */

    @SystemApi

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    @RequiresPermission(Manifest.permission.MASTER_CLEAR)

    public static final String ACTION_MASTER_CLEAR_NOTIFICATION

            = "android.intent.action.MASTER_CLEAR_NOTIFICATION";