Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 1152 into donut

Browse Source 
* changes:
  location: Remove two unnecessary variables.
This commit is contained in:
Android (Google) Code Review
2009-05-07 08:51:33 -07:00
parent f792fc59c1 8dfe5d8c6b
commit 50396063c2
1 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,8 +122,6 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
private static boolean sProvidersLoaded = false; private static boolean sProvidersLoaded = false;
private final Context mContext; private final Context mContext;
private LocationProviderProxy mGpsLocationProvider;
private LocationProviderProxy mNetworkLocationProvider;
private IGeocodeProvider mGeocodeProvider; private IGeocodeProvider mGeocodeProvider;
private IGpsStatusProvider mGpsStatusProvider; private IGpsStatusProvider mGpsStatusProvider;
private LocationWorkerHandler mLocationHandler; private LocationWorkerHandler mLocationHandler;
@@ -548,9 +546,8 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
// Create a gps location provider // Create a gps location provider
GpsLocationProvider provider = new GpsLocationProvider(mContext, this); GpsLocationProvider provider = new GpsLocationProvider(mContext, this);
mGpsStatusProvider = provider.getGpsStatusProvider(); mGpsStatusProvider = provider.getGpsStatusProvider();
mGpsLocationProvider = LocationProviderProxy proxy = new LocationProviderProxy(LocationManager.GPS_PROVIDER, provider);
new LocationProviderProxy(LocationManager.GPS_PROVIDER, provider); addProvider(proxy);
addProvider(mGpsLocationProvider);
} }
updateProvidersLocked(); updateProvidersLocked();
@@ -614,15 +611,12 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
} }
synchronized (mLock) { synchronized (mLock) {
// FIXME - only network location provider supported for now LocationProviderProxy proxy = new LocationProviderProxy(name, provider);
if (LocationManager.NETWORK_PROVIDER.equals(name)) { addProvider(proxy);
mNetworkLocationProvider = new LocationProviderProxy(name, provider); updateProvidersLocked();
addProvider(mNetworkLocationProvider);
updateProvidersLocked();
// notify NetworkLocationProvider of any events it might have missed // notify provider of current network state
mNetworkLocationProvider.updateNetworkState(mNetworkState); proxy.updateNetworkState(mNetworkState);
}
} }
} }
@@ -1929,8 +1923,6 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
synchronized (mLock) { synchronized (mLock) {
pw.println("Current Location Manager state:"); pw.println("Current Location Manager state:");
pw.println(" sProvidersLoaded=" + sProvidersLoaded); pw.println(" sProvidersLoaded=" + sProvidersLoaded);
pw.println(" mGpsLocationProvider=" + mGpsLocationProvider);
pw.println(" mNetworkLocationProvider=" + mNetworkLocationProvider);
pw.println(" mCollector=" + mCollector); pw.println(" mCollector=" + mCollector);
pw.println(" Listeners:"); pw.println(" Listeners:");
int N = mReceivers.size(); int N = mReceivers.size();