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

am 1d28a840: Merge "Location Manager: Fix LocationManager.getBestProvider filtering." into gingerbread

Browse Source
This commit is contained in:
Mike Lockwood
2010-10-26 08:36:24 -07:00
committed by Android Git Automerger
parent ecae8a43b7 1d28a84059
commit 1b571bd3e9
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -574,15 +574,16 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
|| LocationManager.PASSIVE_PROVIDER.equals(provider))
&& (mContext.checkCallingOrSelfPermission(ACCESS_FINE_LOCATION)
!= PackageManager.PERMISSION_GRANTED)) {
throw new SecurityException("Requires ACCESS_FINE_LOCATION permission");
throw new SecurityException("Provider " + provider
+ " requires ACCESS_FINE_LOCATION permission");
}
if (LocationManager.NETWORK_PROVIDER.equals(provider)
&& (mContext.checkCallingOrSelfPermission(ACCESS_FINE_LOCATION)
!= PackageManager.PERMISSION_GRANTED)
&& (mContext.checkCallingOrSelfPermission(ACCESS_COARSE_LOCATION)
!= PackageManager.PERMISSION_GRANTED)) {
throw new SecurityException(
"Requires ACCESS_FINE_LOCATION or ACCESS_COARSE_LOCATION permission");
throw new SecurityException("Provider " + provider
+ " requires ACCESS_FINE_LOCATION or ACCESS_COARSE_LOCATION permission");
}
}
@@ -741,9 +742,9 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
private LocationProviderInterface best(List<String> providerNames) {
ArrayList<LocationProviderInterface> providers;
synchronized (mLock) {
providers = new ArrayList<LocationProviderInterface>(mProviders.size());
for (int i = mProviders.size() - 1; i >= 0; i--) {
providers.add(mProviders.get(i));
providers = new ArrayList<LocationProviderInterface>(providerNames.size());
for (String name : providerNames) {
providers.add(mProvidersByName.get(name));
}
}