summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorSvetoslav <svetoslavganov@google.com>2015-06-14 20:00:59 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-14 20:01:02 +0000
commit6d9778328a3c3c9da525870fff606af8ac5e9529 (patch)
tree349a1b9328b9591ce2c092e941a24d328f215e61 /docs
parenta5c852e03abb9372a6928271a930d7d79e4ec45e (diff)
parentbfa216ac261dd3c5035ad38795650ce5f4ce6fb7 (diff)
downloadframeworks_base-6d9778328a3c3c9da525870fff606af8ac5e9529.zip
frameworks_base-6d9778328a3c3c9da525870fff606af8ac5e9529.tar.gz
frameworks_base-6d9778328a3c3c9da525870fff606af8ac5e9529.tar.bz2
Merge "Remove bookmarks provider and associated permissions - framework" into mnc-dev
Diffstat (limited to 'docs')
-rw-r--r--docs/html/about/versions/android-1.6.jd6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/html/about/versions/android-1.6.jd b/docs/html/about/versions/android-1.6.jd
index 313b77a..8e97ff6 100644
--- a/docs/html/about/versions/android-1.6.jd
+++ b/docs/html/about/versions/android-1.6.jd
@@ -375,11 +375,11 @@ determining the density of the current device screen.</li>
<li>{@link android.Manifest.permission#INSTALL_LOCATION_PROVIDER INSTALL_LOCATION_PROVIDER}:
Allows an application to install a location provider into the Location Manager.
</li>
- <li>{@link android.Manifest.permission#READ_HISTORY_BOOKMARKS READ_HISTORY_BOOKMARKS}:
- Allows an application to read (but not write) the user's browsing history
+ <li>READ_HISTORY_BOOKMARKS:
+ Allows an application to read (but not write) the user's browsing history
and bookmarks.
</li>
- <li>{@link android.Manifest.permission#WRITE_HISTORY_BOOKMARKS WRITE_HISTORY_BOOKMARKS}:
+ <li>WRITE_HISTORY_BOOKMARKS:
Allows an application to write (but not read) the user's browsing history
and bookmarks.
</li>