commit 64d41d7391e57886978e94e86cf01a167226dbfe
author Dianne Hackborn <hackbod@google.com> Thu Feb 07 00:33:31 2013 -0800
committer Dianne Hackborn <hackbod@google.com> Thu Feb 07 00:33:31 2013 -0800
tree 41c3a06aa71068e89912021e8c820e4973f16d2a
parent 34e0b05e28b25dbe20c819ad4fa923c716c37e5f

Fix build, conflict with another change.

Change-Id: If4d7b6c814d946806838cee7dcaccba4c65c3d0f

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

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