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

2020-04-08 00:30:51 +00:00
parent 1ff0d350eb 7e826f9531
commit f6d37fc03f
1 changed files with 1 additions and 1 deletions
--- a/telephony/common/android/telephony/LocationAccessPolicy.java
+++ b/telephony/common/android/telephony/LocationAccessPolicy.java
@@ -311,7 +311,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) {