commit 0b24b1d37a955a0674a31d4da9ee1d0357a1d7f8
author Jeff Sharkey <jsharkey@android.com> Fri Aug 03 11:56:02 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 03 11:56:03 2012 -0700
tree dc40ce14607c20565d3f19e7b6d83f46152122f4
parent a70cd04985eec51d95355cc7b822bc65f4ebce05
parent 821bd8081a3a02de946af7a5c2ab52cdc3e48c4e

Merge "Pass changed NetworkInfo to LocationProvider." into jb-mr1-dev

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 1498a11..198ba8b 100644
--- a/services/java/com/android/server/LocationManagerService.java
+++ b/services/java/com/android/server/LocationManagerService.java
@@ -1804,9 +1804,8 @@
                     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) {