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

Commit d275561d authored by Hall Liu's avatar Hall Liu
Browse files

resolve merge conflicts of 2994fd85 to qt-qpr1-dev-plus-aosp 

Change-Id: I1b47624f6d2f43fbb860b42483d08590d5e80ce8
parents 496ea0a5 2994fd85

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) {