summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Bryan Ferris <bferris@google.com> 2019-06-27 14:39:46 -0700
committer Bryan Ferris <bferris@google.com> 2019-06-27 22:00:19 +0000
commitd2432fc3e35eacb308b620174849b29aa74eee05 (patch)
treeb3e57d9d33a189e73b1176c194ba330b5508e71b
parent459844b640b03e040b060b96ad72b3eee64bfb9b (diff)
[RESTRICT AUTOMERGE] Correct argument order in permission check
The function 'checkAccess' recieves the uid and pid in that order and forwards them to checkSlicePermission in the same order. However, checkSlicePermission expects them in the opposite order. Bug: 135551349 Test: atest FrameworksUiServicesTests Change-Id: I6e49efeab08f0e2a29d9830e6f81905598ae410c
-rw-r--r--services/core/java/com/android/server/slice/SliceManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/slice/SliceManagerService.java b/services/core/java/com/android/server/slice/SliceManagerService.java
index e8f255f4dfc1..f5947ee35ea4 100644
--- a/services/core/java/com/android/server/slice/SliceManagerService.java
+++ b/services/core/java/com/android/server/slice/SliceManagerService.java
@@ -390,7 +390,7 @@ public class SliceManagerService extends ISliceManager.Stub {
}
protected int checkAccess(String pkg, Uri uri, int uid, int pid) {
- return checkSlicePermission(uri, pkg, uid, pid, null);
+ return checkSlicePermission(uri, pkg, pid, uid, null);
}
private String getProviderPkg(Uri uri, int user) {