From 821bd8081a3a02de946af7a5c2ab52cdc3e48c4e Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Fri, 3 Aug 2012 11:53:01 -0700
Subject: [PATCH] Pass changed NetworkInfo to LocationProvider.

LocationProviders often rely on non-default networks, so pass the
network that actually changed, instead of the default.

Bug: 6929692
Change-Id: I31d9eec792e07259282aa1bb57ec66c01962df64
---
 services/java/com/android/server/LocationManagerService.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java
index 1498a115534d4..198ba8b849460 100644
--- 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) {