1 files changed, 3 insertions, 4 deletions
diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java
index 024d8da..d679a5e 100644
--- a/services/java/com/android/server/LocationManagerService.java
+++ b/services/java/com/android/server/LocationManagerService.java
@@ -552,10 +552,8 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
         }
         // Use system settings
         ContentResolver resolver = mContext.getContentResolver();
-        String allowedProviders = Settings.Secure.getString(resolver,
-           Settings.Secure.LOCATION_PROVIDERS_ALLOWED);
 
-        return ((allowedProviders != null) && (allowedProviders.contains(provider)));
+        return Settings.Secure.isLocationProviderEnabled(resolver, provider);
     }
 
     private void checkPermissionsSafe(String provider) {
@@ -1204,8 +1202,9 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
             // Remove expired alerts
             if (intentsToRemove != null) {
                 for (PendingIntent i : intentsToRemove) {
-                    ProximityAlert alert = mProximityAlerts.remove(i);
+                    ProximityAlert alert = mProximityAlerts.get(i);
                     mProximitiesEntered.remove(alert);
+                    removeProximityAlertLocked(i);
                 }
             }
         }