diff options
| author | Tom O'Neill <tomo@google.com> | 2013-09-11 19:20:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-11 19:20:16 +0000 |
| commit | 706113fa2a82e5b613b8555120025b8472ffcbf3 (patch) | |
| tree | 8a75c5d59b662125fac18c99eb0257a2c2364e7c /services | |
| parent | e0b7e4cf455b21316661b158edee12ac5467995c (diff) | |
| parent | d5759437eeb3137e4a05471ff0f4681c0254e81a (diff) | |
| download | frameworks_base-706113fa2a82e5b613b8555120025b8472ffcbf3.zip frameworks_base-706113fa2a82e5b613b8555120025b8472ffcbf3.tar.gz frameworks_base-706113fa2a82e5b613b8555120025b8472ffcbf3.tar.bz2 | |
Merge "Improve some javadoc related to isProviderEnabled() apis" into klp-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/LocationManagerService.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java index de29155..f70f4db 100644 --- a/services/java/com/android/server/LocationManagerService.java +++ b/services/java/com/android/server/LocationManagerService.java @@ -1773,8 +1773,12 @@ public class LocationManagerService extends ILocationManager.Stub { @Override public boolean isProviderEnabled(String provider) { + // TODO: remove this check in next release, see b/10696351 checkResolutionLevelIsSufficientForProviderUse(getCallerAllowedResolutionLevel(), provider); + + // Fused provider is accessed indirectly via criteria rather than the provider-based APIs, + // so we discourage its use if (LocationManager.FUSED_PROVIDER.equals(provider)) return false; int uid = Binder.getCallingUid(); |