diff options
| author | Tom O'Neill <tomo@google.com> | 2014-09-08 19:29:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-08 19:29:57 +0000 |
| commit | 9f8c80df1dbaf927888842775e9cfdda55dbe30a (patch) | |
| tree | 180de3b92786173a05fb63ad073371e76232a30a | |
| parent | 171575266c57e1f7b5d6956e129b3cfa0a01dcdd (diff) | |
| parent | bc3095139e9b8c7640fe6cebb4fc527af916d1be (diff) | |
| download | frameworks_base-9f8c80df1dbaf927888842775e9cfdda55dbe30a.zip frameworks_base-9f8c80df1dbaf927888842775e9cfdda55dbe30a.tar.gz frameworks_base-9f8c80df1dbaf927888842775e9cfdda55dbe30a.tar.bz2 | |
Merge "Fix a STOPSHIP" into lmp-dev
| -rw-r--r-- | location/java/android/location/LocationManager.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/location/java/android/location/LocationManager.java b/location/java/android/location/LocationManager.java index 082a158..2c805bb 100644 --- a/location/java/android/location/LocationManager.java +++ b/location/java/android/location/LocationManager.java @@ -1109,9 +1109,9 @@ public class LocationManager { * {@link #requestLocationUpdates(String, long, float, LocationListener)}. * * <p> - * Before API version 20, this method would throw {@link SecurityException} - * if the location permissions were not sufficient to use the specified - * provider. + * Before API version {@link android.os.Build.VERSION_CODES#L}, this + * method would throw {@link SecurityException} if the location permissions + * were not sufficient to use the specified provider. * * @param provider the name of the provider * @return true if the provider exists and is enabled @@ -1119,7 +1119,6 @@ public class LocationManager { * @throws IllegalArgumentException if provider is null */ public boolean isProviderEnabled(String provider) { - // STOPSHIP: finalize API version number in javadoc checkProvider(provider); try { |