summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Scott Main <smain@google.com> 2012-11-01 11:51:26 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2012-11-01 11:51:26 -0700
commit1e44e96e22c5ad5e1c25e0d5ae1a7f13cbdeab1a (patch)
treebbf46e18615709bcd95e4f26b9ceb96bccdf373e
parent9767597a74bd9a5a265ff72aa5f77dd7efb93b53 (diff)
parent56a3ce038eb03a527b475779d7abf694da1879bc (diff)
am 56a3ce03: Merge "docs: update description for location permissions bug: 6996667" into jb-mr1-dev
* commit '56a3ce038eb03a527b475779d7abf694da1879bc': docs: update description for location permissions bug: 6996667
-rw-r--r--core/res/AndroidManifest.xml6
1 files changed, 4 insertions, 2 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index a5aa71331c79..3f20ed19e5f7 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -503,14 +503,16 @@
android:permissionGroupFlags="personalInfo"
android:priority="330" />
- <!-- Allows an application to access fine (e.g., GPS) location -->
+ <!-- Allows an app to access precise location from location sources such
+ as GPS, cell towers, and Wi-Fi. -->
<permission android:name="android.permission.ACCESS_FINE_LOCATION"
android:permissionGroup="android.permission-group.LOCATION"
android:protectionLevel="dangerous"
android:label="@string/permlab_accessFineLocation"
android:description="@string/permdesc_accessFineLocation" />
- <!-- Allows an application to access coarse (e.g., Cell-ID, WiFi) location -->
+ <!-- Allows an app to access approximate location derived from network location
+ sources such as cell towers and Wi-Fi. -->
<permission android:name="android.permission.ACCESS_COARSE_LOCATION"
android:permissionGroup="android.permission-group.LOCATION"
android:protectionLevel="dangerous"