Merge "Remove checkPermission() call in getAllProviders()." into jb-mr1-dev

This commit is contained in:
Victoria Lease
2012-10-03 08:43:42 -07:00
committed by Android (Google) Code Review

View File

@@ -645,12 +645,11 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
/**
* Returns all providers by name, including passive, but excluding
* fused.
* fused, also including ones that are not permitted to
* be accessed by the calling activity or are currently disabled.
*/
@Override
public List<String> getAllProviders() {
checkPermission();
ArrayList<String> out;
synchronized (mLock) {
out = new ArrayList<String>(mProviders.size());