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

Commit 64d41d73 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Fix build, conflict with another change. 

Change-Id: If4d7b6c814d946806838cee7dcaccba4c65c3d0f
parent 34e0b05e

services/java/com/android/server/LocationManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -1358,7 +1358,7 @@ public class LocationManagerService extends ILocationManager.Stub { 
    private void applyAllProviderRequirementsLocked() {

        for (LocationProviderInterface p : mProviders) {

            // If provider is already disabled, don't need to do anything

            if (!isAllowedBySettingsLocked(p.getName(), UserHandle.getUid(mCurrentUserId, 0))) {

            if (!isAllowedByCurrentUserSettingsLocked(p.getName())) {

                continue;

            }