Merge "getBestProvider() prefers GPS over NLP" into jb-mr1-dev

Victoria Lease · Android (Google) Code Review · commit 72a374705d32 · 2012-09-26T07:59:13.000-07:00
diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java
@@ -703,10 +703,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
`@@ -703,10 +703,10 @@ public String getBestProvider(Criteria criteria, boolean enabledOnly) {`
`703`	`703`	`}`
`704`	`704`
`705`	`705`	`private String pickBest(List<String> providers) {`
`706`		`- if (providers.contains(LocationManager.NETWORK_PROVIDER)) {`
`707`		`- return LocationManager.NETWORK_PROVIDER;`
`708`		`- } else if (providers.contains(LocationManager.GPS_PROVIDER)) {`
	`706`	`+ if (providers.contains(LocationManager.GPS_PROVIDER)) {`
`709`	`707`	`return LocationManager.GPS_PROVIDER;`
	`708`	`+ } else if (providers.contains(LocationManager.NETWORK_PROVIDER)) {`
	`709`	`+ return LocationManager.NETWORK_PROVIDER;`
`710`	`710`	`} else {`
`711`	`711`	`return providers.get(0);`
`712`	`712`	`}`