summaryrefslogtreecommitdiff
path: root/telephony
diff options
context:
space:
mode:
authorHall Liu <hallliu@google.com>2020-04-08 00:49:44 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-04-08 00:49:44 +0000
commita55f29dfe6bddd06720814c56fb64f1773e781a2 (patch)
tree82ebe3d51bca9ea39d363dc1ea378d148c924aa8 /telephony
parentd13e8aa7c712fa2d46287cbe625478a6652d7be7 (diff)
parentf6d37fc03f9b1186f34d49b302b9f0c9281bb92d (diff)
Merge "Fix order of uid/pid in LocationAccessPolicy" into rvc-dev am: f6d37fc03f
Change-Id: I251886aafa2269c90461e22d53c3a388a0441a92
Diffstat (limited to 'telephony')
-rw-r--r--telephony/common/android/telephony/LocationAccessPolicy.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/telephony/common/android/telephony/LocationAccessPolicy.java b/telephony/common/android/telephony/LocationAccessPolicy.java
index f3e9de0d2688..3048ad7c1fb0 100644
--- a/telephony/common/android/telephony/LocationAccessPolicy.java
+++ b/telephony/common/android/telephony/LocationAccessPolicy.java
@@ -311,7 +311,7 @@ public final class LocationAccessPolicy {
}
// If the user or profile is current, permission is granted.
// Otherwise, uid must have INTERACT_ACROSS_USERS_FULL permission.
- return isCurrentProfile(context, uid) || checkInteractAcrossUsersFull(context, uid, pid);
+ return isCurrentProfile(context, uid) || checkInteractAcrossUsersFull(context, pid, uid);
}
private static boolean isLocationModeEnabled(@NonNull Context context, @UserIdInt int userId) {