Fix build, conflict with another change.

Change-Id: If4d7b6c814d946806838cee7dcaccba4c65c3d0f
2013-02-07 00:33:31 -08:00
parent 34e0b05e28
commit 64d41d7391
1 changed files with 1 additions and 1 deletions
--- 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;
            }