diff options
| author | Hall Liu <hallliu@google.com> | 2020-04-07 20:03:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-04-07 20:03:02 +0000 |
| commit | a2b7cd539efc64072b3c8eee6ca33f140e8c4aaf (patch) | |
| tree | caedb44b6ac6aac0f4fc6aaef8f20115081e5dc8 | |
| parent | f562ffc53e2e8c3cd926ad5543c3d94df0d2d9ec (diff) | |
| parent | 4bf1986a323ed8bdff7934a0f9df60e06c8745f6 (diff) | |
| download | base-a2b7cd539efc64072b3c8eee6ca33f140e8c4aaf.tar.gz | |
Merge "Fix order of uid/pid in LocationAccessPolicy" into qt-dev
| -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) { |