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

* commit '0b24b1d37a955a0674a31d4da9ee1d0357a1d7f8':
  Pass changed NetworkInfo to LocationProvider.
This commit is contained in:
Jeff Sharkey
2012-08-03 11:59:01 -07:00
committed by Android Git Automerger

View File

@@ -1804,9 +1804,8 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
mNetworkState = LocationProvider.TEMPORARILY_UNAVAILABLE; mNetworkState = LocationProvider.TEMPORARILY_UNAVAILABLE;
} }
final ConnectivityManager connManager = (ConnectivityManager) context final NetworkInfo info = intent.getParcelableExtra(
.getSystemService(Context.CONNECTIVITY_SERVICE); ConnectivityManager.EXTRA_NETWORK_INFO);
final NetworkInfo info = connManager.getActiveNetworkInfo();
// Notify location providers of current network state // Notify location providers of current network state
synchronized (mLock) { synchronized (mLock) {