diff options
| author | 2023-10-02 23:28:19 +0000 | |
|---|---|---|
| committer | 2023-10-02 23:28:19 +0000 | |
| commit | eb6fc93d02d9f6644950ddf3de804510ede75b75 (patch) | |
| tree | 3ee67b5d9cdc748323cfe076c889f740eebe85cc | |
| parent | 34d6d188a53c5a89e1a31cbe4c8dec12b1db5f4f (diff) | |
| parent | 6ffa5876d1bc51f06991fbac933fbc4bb24d3294 (diff) | |
Merge "Add @RequiresPermission annotation to ACTION_MASTER_CLEAR_NOTIFICATION intent" into main am: 6ffa5876d1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2729476
Change-Id: I4d920fa2b8a1e00d1b01adb373155fa6afebf441
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/api/system-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/content/Intent.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 54ce6f7865cf..76f37b7ffc65 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -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"; diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index e763e951fbc1..c3fd744469e9 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -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"; |