From 7e826f9531a25edbca6e0229c50807a634c430b2 Mon Sep 17 00:00:00 2001 From: Hall Liu Date: Wed, 1 Apr 2020 18:00:09 -0700 Subject: 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 (cherry picked from commit 0cd4dbc0b3993f7e48c4a30ce715e5405fce4fbf) --- telephony/common/android/telephony/LocationAccessPolicy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'telephony/common') 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) { -- cgit v1.2.3