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

Change-Id: I30581c2a002a623434293a62fa6dd90b53e609bd
This commit is contained in:
Hall Liu
2020-04-08 01:23:00 +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.
// 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) {