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

Commit 74b1c1af 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

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



Change-Id: I23258496eab1e4c8dc3e70358733a5ed7e8afaad
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9fc40a46 38b4c18b

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -3532,7 +3532,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
@@ -4444,6 +4444,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";