diff options
| author | Hall Liu <hallliu@google.com> | 2020-04-01 18:00:09 -0700 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-05-21 08:46:39 +0000 |
| commit | 02cdc6f7729379e69142ab3ec6c393e8fb06fae3 (patch) | |
| tree | ad4e075895ea8736e4dcf4f380cee364a51692cf | |
| parent | 1db949888e8c1d86cd0cd1ec90dc1dd29a19a092 (diff) | |
| download | base-02cdc6f7729379e69142ab3ec6c393e8fb06fae3.tar.gz | |
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
(cherry picked from commit 4bf1986a323ed8bdff7934a0f9df60e06c8745f6)
| -rw-r--r-- | telephony/java/android/telephony/LocationAccessPolicy.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/LocationAccessPolicy.java b/telephony/java/android/telephony/LocationAccessPolicy.java index eb744f619f2e..2d7c561cd180 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) { |