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

Commit ba82661e authored by Victoria Lease's avatar Victoria Lease Committed by Android Git Automerger
Browse files

am 3421fea5: am 72a37470: Merge "getBestProvider() prefers GPS over NLP" into jb-mr1-dev 

* commit '3421fea5':
  getBestProvider() prefers GPS over NLP
parents ae4b3ef3 3421fea5

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

+3 −3
Original line number Diff line number Diff line
@@ -703,10 +703,10 @@ public class LocationManagerService extends ILocationManager.Stub implements Run 
    }



    private String pickBest(List<String> providers) {

        if (providers.contains(LocationManager.NETWORK_PROVIDER)) {

            return LocationManager.NETWORK_PROVIDER;

        } else if (providers.contains(LocationManager.GPS_PROVIDER)) {

        if (providers.contains(LocationManager.GPS_PROVIDER)) {

            return LocationManager.GPS_PROVIDER;

        } else if (providers.contains(LocationManager.NETWORK_PROVIDER)) {

            return LocationManager.NETWORK_PROVIDER;

        } else {

            return providers.get(0);

        }