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

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

Browse Source
This commit is contained in:
Victoria Lease
2012-10-03 08:43:42 -07:00
committed by Android (Google) Code Review
parent 1fd3474585 0d21e2161f
commit fc6770e748
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -645,12 +645,11 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
/** /**
* Returns all providers by name, including passive, but excluding * 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 @Override
public List<String> getAllProviders() { public List<String> getAllProviders() {
checkPermission();
ArrayList<String> out; ArrayList<String> out;
synchronized (mLock) { synchronized (mLock) {
out = new ArrayList<String>(mProviders.size()); out = new ArrayList<String>(mProviders.size());