summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Alex Dadukin <adadukin@google.com> 2024-03-04 13:58:47 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-03-04 13:58:47 +0000
commita168b9f35b940f91bf389579c4c9729ee9fc471f (patch)
tree8bd16eb3541603681e48c0e4f5a12ec316c00e14
parent880b7e80a896431b551a4ae18fbf9eebdf69c88f (diff)
parente07f49e7729e1c01382a460038051e6db0a3f3cc (diff)
Merge "Remove @RequiresPermission annotation from checkMediaRoutingControlPermission" into main
-rw-r--r--services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java b/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java
index 1f7d5490dd6d..2a487856bfb8 100644
--- a/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java
+++ b/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java
@@ -851,7 +851,6 @@ class MediaRouter2ServiceImpl {
}
}
- @RequiresPermission(value = Manifest.permission.MEDIA_ROUTING_CONTROL, conditional = true)
private boolean checkMediaRoutingControlPermission(
int callerUid, int callerPid, @Nullable String callerPackageName) {
return PermissionChecker.checkPermissionForDataDelivery(