diff options
| author | Hall Liu <hallliu@google.com> | 2020-04-07 21:32:33 +0000 |
|---|---|---|
| committer | Hall Liu <hallliu@google.com> | 2020-04-07 21:32:50 +0000 |
| commit | d275561d876db4a455c413fee23fd4ab886c8dad (patch) | |
| tree | e614ae971c4927f43b759b808e03b8b75969b480 /telephony | |
| parent | 496ea0a527deb870070bc699f5ac8fc430d87486 (diff) | |
| parent | 2994fd8537885391ddc56c4db94f5099f28442e7 (diff) | |
resolve merge conflicts of 2994fd8537885391ddc56c4db94f5099f28442e7 to qt-qpr1-dev-plus-aosp
Change-Id: I1b47624f6d2f43fbb860b42483d08590d5e80ce8
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/common/android/telephony/LocationAccessPolicy.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/telephony/common/android/telephony/LocationAccessPolicy.java b/telephony/common/android/telephony/LocationAccessPolicy.java index 8ac675502527..b1dc1da76272 100644 --- a/telephony/common/android/telephony/LocationAccessPolicy.java +++ b/telephony/common/android/telephony/LocationAccessPolicy.java @@ -301,7 +301,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) { |