am 72a37470: Merge "getBestProvider() prefers GPS over NLP" into jb-mr1-dev (3421fea5) · Commits · e / os / android_frameworks_base

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

+3 −3

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

	private String pickBest(List<String> providers) {		private String pickBest(List<String> providers) {
	if (providers.contains(LocationManager.NETWORK_PROVIDER)) {		if (providers.contains(LocationManager.GPS_PROVIDER)) {
	return LocationManager.NETWORK_PROVIDER;
	} else if (providers.contains(LocationManager.GPS_PROVIDER)) {
	return LocationManager.GPS_PROVIDER;		return LocationManager.GPS_PROVIDER;
			} else if (providers.contains(LocationManager.NETWORK_PROVIDER)) {
			return LocationManager.NETWORK_PROVIDER;
	} else {		} else {
	return providers.get(0);		return providers.get(0);
	}		}