Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75f6c51d authored by Hall Liu's avatar Hall Liu Committed by Android (Google) Code Review
Browse files

Merge "resolve merge conflicts of 2994fd85 to... 

Merge "resolve merge conflicts of 2994fd85 to qt-qpr1-dev-plus-aosp" into qt-qpr1-dev-plus-aosp
parents c3adbeb8 d275561d

telephony/common/android/telephony/LocationAccessPolicy.java

+1 −1
Original line number Diff line number Diff line
@@ -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) {