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

Change-Id: I251886aafa2269c90461e22d53c3a388a0441a92
This commit is contained in:
Hall Liu
2020-04-08 00:49:44 +00:00
committed by Automerger Merge Worker

View File

@@ -311,7 +311,7 @@ public final class LocationAccessPolicy {
} }
// If the user or profile is current, permission is granted. // If the user or profile is current, permission is granted.
// Otherwise, uid must have INTERACT_ACROSS_USERS_FULL permission. // 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) { private static boolean isLocationModeEnabled(@NonNull Context context, @UserIdInt int userId) {