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

Author: jsharkey

services/java/com/android/server/LocationManagerService.java

@@ -1804,9 +1804,8 @@ public void onReceive(Context context, Intent intent) {
                     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) {