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

Commit 1d15cb0b authored by Steve Block's avatar Steve Block Committed by Android Git Automerger
Browse files

am 65dfac3b: Merge "Clean up JavaDoc for CookieManager" into jb-mr1-dev 

* commit '65dfac3b':
  Clean up JavaDoc for CookieManager
parents 02ccc14b 65dfac3b

core/java/android/webkit/CookieManager.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -37,8 +37,8 @@ public class CookieManager { 
    /**

    /**

     * Gets the singleton CookieManager instance. If this method is used

     * Gets the singleton CookieManager instance. If this method is used

     * before the application instantiates a {@link WebView} instance,

     * before the application instantiates a {@link WebView} instance,

     * {@link CookieSyncManager#createInstance(Context)} must be called

     * {@link CookieSyncManager#createInstance CookieSyncManager.createInstance(Context)}

     * first.

     * must be called first.

     *

     *

     * @return the singleton CookieManager instance

     * @return the singleton CookieManager instance

     */

     */

core/java/android/webkit/WebView.java

+1 −4
Original line number Original line Diff line number Diff line
@@ -164,10 +164,7 @@ import java.util.Map; 
 *

 *

 * <p>For obvious security reasons, your application has its own

 * <p>For obvious security reasons, your application has its own

 * cache, cookie store etc.&mdash;it does not share the Browser

 * cache, cookie store etc.&mdash;it does not share the Browser

 * application's data. Cookies are managed on a separate thread, so

 * application's data.

 * operations like index building don't block the UI

 * thread. Follow the instructions in {@link android.webkit.CookieSyncManager}

 * if you want to use cookies in your application.

 * </p>

 * </p>

 *

 *

 * <p>By default, requests by the HTML to open new windows are

 * <p>By default, requests by the HTML to open new windows are