diff options
| author | 2022-04-13 01:11:24 +0000 | |
|---|---|---|
| committer | 2022-04-13 01:11:24 +0000 | |
| commit | 464f9952fe397fd56c7b6a7a2e22ca52d3236e33 (patch) | |
| tree | f938c329245e62dfd4b6f8bdd7408d81aabc0805 | |
| parent | 680e460513d19dc2d4c632f85b9aaf6362e3068f (diff) | |
| parent | e7282659ef9d17e23d2073b62d1e4ad8caa44e32 (diff) | |
Merge "Fix the @RequiresPermission annotation." into tm-dev am: 8338395749 am: e7282659ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17698251
Change-Id: I551362c301537c87d2a9bccb08b2475dd26ab4f6
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/app/BroadcastOptions.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 03b4aa52e69a..b57eff07deff 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -763,7 +763,7 @@ package android.app { method public void clearRequireCompatChange(); method public boolean isPendingIntentBackgroundActivityLaunchAllowed(); method public static android.app.BroadcastOptions makeBasic(); - method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public void recordResponseEventWhileInBackground(@IntRange(from=0) long); + method @RequiresPermission(android.Manifest.permission.ACCESS_BROADCAST_RESPONSE_STATS) public void recordResponseEventWhileInBackground(@IntRange(from=0) long); method @RequiresPermission(android.Manifest.permission.START_ACTIVITIES_FROM_BACKGROUND) public void setBackgroundActivityStartsAllowed(boolean); method public void setDontSendToRestrictedApps(boolean); method public void setPendingIntentBackgroundActivityLaunchAllowed(boolean); diff --git a/core/java/android/app/BroadcastOptions.java b/core/java/android/app/BroadcastOptions.java index 8b3c9fa73798..56f8760f6059 100644 --- a/core/java/android/app/BroadcastOptions.java +++ b/core/java/android/app/BroadcastOptions.java @@ -532,7 +532,7 @@ public class BroadcastOptions extends ComponentOptions { * @hide */ @SystemApi - @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) + @RequiresPermission(android.Manifest.permission.ACCESS_BROADCAST_RESPONSE_STATS) public void recordResponseEventWhileInBackground(@IntRange(from = 0) long id) { mIdForResponseEvent = id; } |