Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78133796 authored by Quddus Chong's avatar Quddus Chong Committed by Android (Google) Code Review
Browse files

Merge "docs: Added behavior change section to indicate removal of global... 

Merge "docs: Added behavior change section to indicate removal of global bookmark       support in Android 6.0 (M). bug: 23799935" into mnc-mr-docs
parents 3e7d3d02 ad3b4d9b

docs/html/about/versions/marshmallow/android-6.0-changes.jd

+11 −2
Original line number Diff line number Diff line
@@ -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

docs/html/tools/debugging/annotations.jd

+5 −7
Original line number Diff line number Diff line
@@ -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