summaryrefslogtreecommitdiff
path: root/telephony/common
diff options
context:
space:
mode:
authorHall Liu <hallliu@google.com>2020-04-08 00:30:51 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-04-08 00:30:51 +0000
commitf6d37fc03f9b1186f34d49b302b9f0c9281bb92d (patch)
tree2f8988719c119d08959fc4e8c5f4cfb3f609db01 /telephony/common
parent1ff0d350eb768ca44e0b0d5fdf117c0819ec810d (diff)
parent7e826f9531a25edbca6e0229c50807a634c430b2 (diff)
Merge "Fix order of uid/pid in LocationAccessPolicy" into rvc-dev
Diffstat (limited to 'telephony/common')
-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) {