getBestProvider() prefers GPS over NLP

Victoria Lease · Victoria Lease · commit 1925e290e7ac · 2012-09-24T17:00:18.000-07:00
Preferring the GPS location provider over NLP should produce better
average and worst-case results than NLP, which is very accurate in
certain conditions and completely useless in others.

Bug: 7182301
Change-Id: If7d50f0d3ac663cbfd84b7033adc204c11bcaca4
diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java
@@ -687,10 +687,10 @@ public String getBestProvider(Criteria criteria, boolean enabledOnly) {
     }
 
     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);
         }

Original file line number	Diff line number	Diff line change
`@@ -687,10 +687,10 @@ public String getBestProvider(Criteria criteria, boolean enabledOnly) {`
`687`	`687`	`}`
`688`	`688`
`689`	`689`	`private String pickBest(List<String> providers) {`
`690`		`- if (providers.contains(LocationManager.NETWORK_PROVIDER)) {`
`691`		`- return LocationManager.NETWORK_PROVIDER;`
`692`		`- } else if (providers.contains(LocationManager.GPS_PROVIDER)) {`
	`690`	`+ if (providers.contains(LocationManager.GPS_PROVIDER)) {`
`693`	`691`	`return LocationManager.GPS_PROVIDER;`
	`692`	`+ } else if (providers.contains(LocationManager.NETWORK_PROVIDER)) {`
	`693`	`+ return LocationManager.NETWORK_PROVIDER;`
`694`	`694`	`} else {`
`695`	`695`	`return providers.get(0);`
`696`	`696`	`}`