Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '72a374705d32cf715443aa203f75c159e1bc9bd5':
  getBestProvider() prefers GPS over NLP
This commit is contained in:
Victoria Lease
2012-09-26 08:01:32 -07:00
committed by Android Git Automerger
parent 05ff614589 72a374705d
commit 3421fea504
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/java/com/android/server/LocationManagerService.java
View File

@@ -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);
}