drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AI 144415: am: CL 144372 Cleanup Settings support for enabling and disabling location providers:

Browse Source 
LocationManagerService now listens for changes to settings,
  making LocationManager.updateProviders() unnecessary.
  Removed LocationManager.updateProviders()
  Added Settings.Secure.setLocationProviderEnabled(), which is a thread-safe way
  of enabling or disabling a single location provider.
  This is safer than reading, modifying and writing the LOCATION_PROVIDERS_ALLOWED directly.
  BUG=1729031
  Original author: lockwood

Automated import of CL 144415
This commit is contained in:
Mike Lockwood
2009-04-02 23:41:33 -07:00
committed by The Android Open Source Project
parent 75e3034a35
commit bd2a7126e5
5 changed files with 138 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
services/java/com/android/server/LocationManagerService.java
View File

@ -28,17 +28,21 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Observable;
import java.util.Observer;
import java.util.Set;
import java.util.regex.Pattern;
import android.app.AlarmManager;
import android.app.PendingIntent;
import android.content.BroadcastReceiver;
import android.content.ContentQueryMap;
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.pm.PackageManager;
import android.database.Cursor;
import android.location.Address;
import android.location.IGpsStatusListener;
import android.location.ILocationListener;
@ -222,6 +226,9 @@ public class LocationManagerService extends ILocationManager.Stub
private int mNetworkState = LocationProvider.TEMPORARILY_UNAVAILABLE;
private boolean mWifiEnabled = false;
// for Settings change notification
private ContentQueryMap mSettings;
/**
* A wrapper class holding either an ILocationListener or a PendingIntent to receive
* location updates.
@ -345,6 +352,14 @@ public class LocationManagerService extends ILocationManager.Stub
}
}
private final class SettingsObserver implements Observer {
public void update(Observable o, Object arg) {
synchronized (mLocationListeners) {
updateProvidersLocked();
}
}
}
private Location readLastKnownLocationLocked(String provider) {
Location location = null;
String s = null;
@ -593,6 +608,16 @@ public class LocationManagerService extends ILocationManager.Stub
intentFilter.addAction(Intent.ACTION_PACKAGE_RESTARTED);
context.registerReceiver(powerStateReceiver, intentFilter);
// listen for settings changes
ContentResolver resolver = mContext.getContentResolver();
Cursor settingsCursor = resolver.query(Settings.Secure.CONTENT_URI, null,
"(" + Settings.System.NAME + "=?)",
new String[]{Settings.Secure.LOCATION_PROVIDERS_ALLOWED},
null);
mSettings = new ContentQueryMap(settingsCursor, Settings.System.NAME, true, mLocationHandler);
SettingsObserver settingsObserver = new SettingsObserver();
mSettings.addObserver(settingsObserver);
// Get the wifi manager
mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
@ -773,12 +798,6 @@ public class LocationManagerService extends ILocationManager.Stub
return out;
}
public void updateProviders() {
synchronized (mLocationListeners) {
updateProvidersLocked();
}
}
private void updateProvidersLocked() {
for (LocationProviderImpl p : LocationProviderImpl.getProviders()) {
boolean isEnabled = p.isEnabled();