am 0b24b1d3: Merge "Pass changed NetworkInfo to LocationProvider." into jb-mr1-dev

* commit '0b24b1d37a955a0674a31d4da9ee1d0357a1d7f8': Pass changed NetworkInfo to LocationProvider.
2012-08-03 11:59:01 -07:00
parent e0cf4bfbd7 0b24b1d37a
commit 72f2a09430
1 changed files with 2 additions and 3 deletions
--- a/services/java/com/android/server/LocationManagerService.java
+++ b/services/java/com/android/server/LocationManagerService.java
@@ -1804,9 +1804,8 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
                    mNetworkState = LocationProvider.TEMPORARILY_UNAVAILABLE;
                }

-                final ConnectivityManager connManager = (ConnectivityManager) context
-                        .getSystemService(Context.CONNECTIVITY_SERVICE);
-                final NetworkInfo info = connManager.getActiveNetworkInfo();
+                final NetworkInfo info = intent.getParcelableExtra(
+                        ConnectivityManager.EXTRA_NETWORK_INFO);

                // Notify location providers of current network state
                synchronized (mLock) {