From ad3b4d9bc7e6f47b9f6d948e979b8b22590e2629 Mon Sep 17 00:00:00 2001
From: Quddus Chong <quddusc@google.com>
Date: Wed, 30 Sep 2015 12:03:52 -0700
Subject: [PATCH] docs: Added behavior change section to indicate removal of
 global bookmark       support in Android 6.0 (M). bug: 23799935

Change-Id: Icbfca85de04f0b2b7d648c0c54a3e2d7ab74300f
---
 .../versions/marshmallow/android-6.0-changes.jd     | 13 +++++++++++--
 docs/html/tools/debugging/annotations.jd            | 12 +++++-------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/docs/html/about/versions/marshmallow/android-6.0-changes.jd b/docs/html/about/versions/marshmallow/android-6.0-changes.jd
index 6f44a8c821cc8..8c5a1b6b7c23a 100644
--- a/docs/html/about/versions/marshmallow/android-6.0-changes.jd
+++ b/docs/html/about/versions/marshmallow/android-6.0-changes.jd
@@ -18,7 +18,8 @@ page.image=images/cards/samples-new_2x.png
     <li><a href="#behavior-hardware-id">Access to Hardware Identifiers</a></li>
     <li><a href="#behavior-notifications">Notifications</a></li>
     <li><a href="#behavior-audiomanager-Changes">AudioManager Changes</a></li>
-    <li><a href="#behavior-test-selection">Text Selection</a></li>
+    <li><a href="#behavior-text-selection">Text Selection</a></li>
+    <li><a href="#behavior-bookmark-browser">Browser Bookmark Changes</a></li>
     <li><a href="#behavior-keystore">Android Keystore Changes</a></li>
     <li><a href="#behavior-network">Wi-Fi and Networking Changes</a></li>
     <li><a href="#behavior-camera">Camera Service Changes</a></li>
@@ -157,7 +158,7 @@ adjustStreamVolume()} method and pass in the direction value
 {@link android.media.AudioManager#ADJUST_UNMUTE}.</p>
 
 
-<h2 id="behavior-test-selection">Text Selection</h2>
+<h2 id="behavior-text-selection">Text Selection</h2>
 
 <img src="{@docRoot}images/android-6.0/text-selection.gif"
 style="float:right; margin:0 0 20px 30px" width="360" height="640" />
@@ -202,6 +203,14 @@ the framework. In devices running Android 6.0 (API level 23), that allows the fr
 Android 5.1 (API level 22) or lower, only the {@link android.support.v7.app.ActionBar} modes are
 supported.</p>
 
+<h2 id="behavior-bookmark-browser">Browser Bookmark Changes</h2>
+<p>This release removes support for global bookmarks. The
+{@code android.provider.Browser.getAllBookmarks()} and {@code android.provider.Browser.saveBookmark()}
+methods are now removed. Likewise, the {@code READ_HISTORY_BOOKMARKS} and {@code WRITE_HISTORY_BOOKMARKS}
+permissions are removed. If your app targets Android 6.0 (API level 23) or higher, don't access
+bookmarks from the global provider or use the bookmark permissions. Instead, your app should store
+bookmarks data internally.</p>
+
 <h2 id="behavior-keystore">Android Keystore Changes</h2>
 <p>With this release, the
 <a href="{@docRoot}training/articles/keystore.html">Android Keystore provider</a> no longer supports
diff --git a/docs/html/tools/debugging/annotations.jd b/docs/html/tools/debugging/annotations.jd
index b0d5a228ac701..fbdb9e4bbfd52 100644
--- a/docs/html/tools/debugging/annotations.jd
+++ b/docs/html/tools/debugging/annotations.jd
@@ -266,19 +266,17 @@ permissions, use the <code>allOf</code> attribute. The following example annotat
 public abstract void setWallpaper(Bitmap bitmap) throws IOException;
 </pre>
 
-<p>This example requires the caller of the
-<code>updateVisitedHistory</code> method to have both read and write bookmark history permissions. </p>
-
+<p>This example requires the caller of the {@code copyFile()} method to have both read and write
+permissions to external storage:</p>
 <pre>
 &#64;RequiresPermission(allOf = {
-    Manifest.permission.READ_HISTORY_BOOKMARKS,
-    Manifest.permission.WRITE_HISTORY_BOOKMARKS})
-public static final void updateVisitedHistory(ContentResolver cr, String url, boolean real) {
+    Manifest.permission.READ_EXTERNAL_STORAGE,
+    Manifest.permission.WRITE_EXTERNAL_STORAGE})
+public static final void copyFile(String dest, String source) {
     ...
 }
 </pre>
 
-
 <h2 id="check-result">Adding CheckResults Annotations</h2>
 <p>Use the <code>@CheckResults</code> annotation to
 validate that a method's result or return value is actually used. The following example annotates