diff options
| author | Hall Liu <hallliu@google.com> | 2020-04-07 20:19:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-07 20:19:14 +0000 |
| commit | 2994fd8537885391ddc56c4db94f5099f28442e7 (patch) | |
| tree | 5824974e94ee3064b76f92c5c338dec412c3a77a | |
| parent | 5a9674e3acdb491c15aceebb3632475caf4e7d44 (diff) | |
| parent | a2b7cd539efc64072b3c8eee6ca33f140e8c4aaf (diff) | |
| download | frameworks_base-2994fd8537885391ddc56c4db94f5099f28442e7.tar.gz frameworks_base-2994fd8537885391ddc56c4db94f5099f28442e7.tar.bz2 frameworks_base-2994fd8537885391ddc56c4db94f5099f28442e7.zip | |
Merge "Fix order of uid/pid in LocationAccessPolicy" into qt-dev am: a2b7cd539e
Change-Id: Ibe111442fec745063b27e9804c7125feee1fffc2
| -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 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) { |