Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72f2a094 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

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

* commit '0b24b1d3':
  Pass changed NetworkInfo to LocationProvider.
parents e0cf4bfb 0b24b1d3

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

+2 −3
Original line number Diff line number Diff line
@@ -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) {