commit 8dfe5d8c6ba9cb165994f09843abaa6302d63c1d
author Mike Lockwood <lockwood@android.com> Thu May 07 11:49:01 2009 -0400
committer Mike Lockwood <lockwood@android.com> Thu May 07 11:49:01 2009 -0400
tree f6299aadc4c3572ab9e96325332b1b890c76697c
parent 0528b9b26a9d64ba43acd0e334638303d514b8eb

location: Remove two unnecessary variables.

Signed-off-by: Mike Lockwood <lockwood@android.com>

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 9750d4d..c924d8d 100644
--- a/services/java/com/android/server/LocationManagerService.java
+++ b/services/java/com/android/server/LocationManagerService.java
@@ -122,8 +122,6 @@
     private static boolean sProvidersLoaded = false;
 
     private final Context mContext;
-    private LocationProviderProxy mGpsLocationProvider;
-    private LocationProviderProxy mNetworkLocationProvider;
     private IGeocodeProvider mGeocodeProvider;
     private IGpsStatusProvider mGpsStatusProvider;
     private LocationWorkerHandler mLocationHandler;
@@ -548,9 +546,8 @@
             // Create a gps location provider
             GpsLocationProvider provider = new GpsLocationProvider(mContext, this);
             mGpsStatusProvider = provider.getGpsStatusProvider();
-            mGpsLocationProvider =
-                    new LocationProviderProxy(LocationManager.GPS_PROVIDER, provider);
-            addProvider(mGpsLocationProvider);
+            LocationProviderProxy proxy = new LocationProviderProxy(LocationManager.GPS_PROVIDER, provider);
+            addProvider(proxy);
         }
 
         updateProvidersLocked();
@@ -614,15 +611,12 @@
         }
 
         synchronized (mLock) {
-            // FIXME - only network location provider supported for now
-            if (LocationManager.NETWORK_PROVIDER.equals(name)) {
-                mNetworkLocationProvider = new LocationProviderProxy(name, provider);
-                addProvider(mNetworkLocationProvider);
-                updateProvidersLocked();
+            LocationProviderProxy proxy = new LocationProviderProxy(name, provider);
+            addProvider(proxy);
+            updateProvidersLocked();
 
-                // notify NetworkLocationProvider of any events it might have missed
-                mNetworkLocationProvider.updateNetworkState(mNetworkState);
-            }
+            // notify provider of current network state
+            proxy.updateNetworkState(mNetworkState);
         }
     }
 
@@ -1929,8 +1923,6 @@
         synchronized (mLock) {
             pw.println("Current Location Manager state:");
             pw.println("  sProvidersLoaded=" + sProvidersLoaded);
-            pw.println("  mGpsLocationProvider=" + mGpsLocationProvider);
-            pw.println("  mNetworkLocationProvider=" + mNetworkLocationProvider);
             pw.println("  mCollector=" + mCollector);
             pw.println("  Listeners:");
             int N = mReceivers.size();