summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Bryan Ferris <bferris@google.com> 2019-06-28 23:59:16 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-06-28 23:59:16 +0000
commitb2964b295652505432ab37affe95f73785499e15 (patch)
tree17a2de74a839d23a60bb98b9dfada405337175c1
parent7b96d83aa2dd77477fc74a0fe16aedb320eb7790 (diff)
parentd2432fc3e35eacb308b620174849b29aa74eee05 (diff)
Merge "[RESTRICT AUTOMERGE] Correct argument order in permission check" into pi-dev
-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) {