Fix build, conflict with another change.

Change-Id: If4d7b6c814d946806838cee7dcaccba4c65c3d0f

1 files changed, 1 insertions, 1 deletions

diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java
index c8d6ae8721dd..bcb7cb7730ba 100644
--- a/services/java/com/android/server/LocationManagerService.java
+++ b/services/java/com/android/server/LocationManagerService.java
@@ -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;
             }