Merge "LocationManagerService: Respect the type of NetworkInfo that was passed" into jellybean

                final ConnectivityManager connManager = (ConnectivityManager) context

                        .getSystemService(Context.CONNECTIVITY_SERVICE);

                final NetworkInfo info = connManager.getActiveNetworkInfo();

                final NetworkInfo retInfo =

                        (NetworkInfo) intent.getParcelableExtra(ConnectivityManager.EXTRA_NETWORK_INFO);

                // Pull the latest data. Note we cannot use getActiveNetworkInfo() here as this

                // broadcast may be for a different mobile type than the current dominant connection,

                // such as SUPL, and GpsLocationProvider needs to process those.

                final NetworkInfo info = connManager.getNetworkInfo(retInfo.getType());

                // Notify location providers of current network state

                synchronized (mLock) {