From 64d41d7391e57886978e94e86cf01a167226dbfe Mon Sep 17 00:00:00 2001
From: Dianne Hackborn <hackbod@google.com>
Date: Thu, 7 Feb 2013 00:33:31 -0800
Subject: Fix build, conflict with another change.

Change-Id: If4d7b6c814d946806838cee7dcaccba4c65c3d0f
---
 services/java/com/android/server/LocationManagerService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
             }
 
-- 
cgit v1.2.3-59-g8ed1b