summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHall Liu <hallliu@google.com>2020-04-01 18:00:09 -0700
committerHall Liu <hallliu@google.com>2020-04-02 01:06:00 +0000
commit4bf1986a323ed8bdff7934a0f9df60e06c8745f6 (patch)
treea3b076c098e2e12ba1e2917a2dd35077662b9b60
parent2d62d5b7ecdd5524b36360d80501e1151e9525ec (diff)
downloadframeworks_base-4bf1986a323ed8bdff7934a0f9df60e06c8745f6.tar.gz
frameworks_base-4bf1986a323ed8bdff7934a0f9df60e06c8745f6.tar.bz2
frameworks_base-4bf1986a323ed8bdff7934a0f9df60e06c8745f6.zip
Fix order of uid/pid in LocationAccessPolicy
Fix the order in which uid and pid are passed into the permission check. Test: atest LocationAccessPolicyTest Fixes: 151330809 Change-Id: I479c8fc123d5a994e8cbe6489aa00bea4abca1c7 Merged-In: I479c8fc123d5a994e8cbe6489aa00bea4abca1c7
-rw-r--r--telephony/java/android/telephony/LocationAccessPolicy.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/LocationAccessPolicy.java b/telephony/java/android/telephony/LocationAccessPolicy.java
index eb744f619f2..2d7c561cd18 100644
--- a/telephony/java/android/telephony/LocationAccessPolicy.java
+++ b/telephony/java/android/telephony/LocationAccessPolicy.java
@@ -286,7 +286,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) {