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

am 92d99223: Merge "LocationManager javadoc permission fixes" into jb-mr1-dev

Browse Source 
* commit '92d9922370ffe50932361602f46b275d085e61b8':
  LocationManager javadoc permission fixes
This commit is contained in:
Victoria Lease
2012-10-22 13:41:15 -07:00
committed by Android Git Automerger
parent 6eb9844c8e 92d9922370
commit 43a883759f
1 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
location/java/android/location/LocationManager.java
View File

@@ -72,15 +72,10 @@ import com.android.internal.location.ProviderProperties;
* <p class="note">Unless noted, all Location API methods require * <p class="note">Unless noted, all Location API methods require
* the {@link android.Manifest.permission#ACCESS_COARSE_LOCATION} or * the {@link android.Manifest.permission#ACCESS_COARSE_LOCATION} or
* {@link android.Manifest.permission#ACCESS_FINE_LOCATION} permissions. * {@link android.Manifest.permission#ACCESS_FINE_LOCATION} permissions.
* If your application only has the Coarse permission then it will still * If your application only has the coarse permission then it will not have
* receive location results, but the update rate will be throttled and * access to the GPS or passive location providers. Other providers will still
* the exact location will be obfuscated to a coarse level of accuracy. * return location results, but the update rate will be throttled and the exact
* * location will be obfuscated to a coarse level of accuracy.
* <p> class="note">Before API level 17, the use of 'fine' location
* providers such as GPS required the fine permission. As of API level
* 17, applications with only the coarse permission may use all providers,
* including GPS, but the locations are obfuscated (made coarse) before
* being sent to the application.
*/ */
public class LocationManager { public class LocationManager {
private static final String TAG = "LocationManager"; private static final String TAG = "LocationManager";
@@ -109,13 +104,8 @@ public class LocationManager {
* *
* <p>This provider determines location using * <p>This provider determines location using
* satellites. Depending on conditions, this provider may take a while to return * satellites. Depending on conditions, this provider may take a while to return
* a location fix. * a location fix. Requires the permission
* * {@link android.Manifest.permission#ACCESS_FINE_LOCATION}.
* <p>Before API version 17, this provider required the
* {@link android.Manifest.permission#ACCESS_FINE_LOCATION} permission.
* From API version 17 and onwards, this provider can also be used with
* {@link android.Manifest.permission#ACCESS_COARSE_LOCATION}, however
* the locations returned will be obfuscated to a coarse level of accuracy.
* *
* <p> The extras Bundle for the GPS location provider can contain the * <p> The extras Bundle for the GPS location provider can contain the
* following key/value pairs: * following key/value pairs:
@@ -136,13 +126,9 @@ public class LocationManager {
* when other applications or services request them without actually requesting * when other applications or services request them without actually requesting
* the locations yourself. This provider will return locations generated by other * the locations yourself. This provider will return locations generated by other
* providers. You can query the {@link Location#getProvider()} method to determine * providers. You can query the {@link Location#getProvider()} method to determine
* the origin of the location update. * the origin of the location update. Requires the permission
* * {@link android.Manifest.permission#ACCESS_FINE_LOCATION}, although if the GPS is
* <p>Before API version 17, this provider required the * not enabled this provider might only return coarse fixes.
* {@link android.Manifest.permission#ACCESS_FINE_LOCATION} permission.
* From API version 17 and onwards, this provider can also be used with
* {@link android.Manifest.permission#ACCESS_COARSE_LOCATION}, however
* the locations returned will be obfuscated to a coarse level of accuracy.
* *
* @deprecated Use {@link LocationRequest} instead, see notes on {@link LocationManager} * @deprecated Use {@link LocationRequest} instead, see notes on {@link LocationManager}
*/ */