Merge "Fix order of uid/pid in LocationAccessPolicy" into qt-dev

2020-04-07 20:03:02 +00:00
parent f562ffc53e 4bf1986a32
commit a2b7cd539e
1 changed files with 1 additions and 1 deletions
--- 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) {