commit 4bf1986a323ed8bdff7934a0f9df60e06c8745f6
author Hall Liu <hallliu@google.com> Wed Apr 01 18:00:09 2020 -0700
committer Hall Liu <hallliu@google.com> Thu Apr 02 01:06:00 2020 +0000
tree a3b076c098e2e12ba1e2917a2dd35077662b9b60
parent 2d62d5b7ecdd5524b36360d80501e1151e9525ec

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

telephony/java/android/telephony/LocationAccessPolicy.java

diff --git a/telephony/java/android/telephony/LocationAccessPolicy.java b/telephony/java/android/telephony/LocationAccessPolicy.java
index eb744f6..2d7c561 100644
--- a/telephony/java/android/telephony/LocationAccessPolicy.java
+++ b/telephony/java/android/telephony/LocationAccessPolicy.java
@@ -286,7 +286,7 @@
         }
         // 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) {