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

Commit 8f931a26 authored by Daniel Bateman's avatar Daniel Bateman Committed by Gerrit Code Review
Browse files

LocationManagerService: Respect the type of NetworkInfo that was passed 

The location manager service which sends network info updates to the
gps location providers was changed to ignore the connectivity update's
type and just fetch the dominant network info, but this is a problem
since we want SUPL updates even if it's not the dominant network type.

This change makes it fetch the latest info about the network type for
which the update was actually intended.

Change-Id: Ic8e78482f584de3143a6b815361f6b6d49c498b5
parent c6df362b

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

+7 −1
Original line number Diff line number Diff line
@@ -2133,7 +2133,13 @@ public class LocationManagerService extends ILocationManager.Stub implements Run 


                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) {