Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clean up JavaDoc for CookieManager" into jb-mr1-dev

Browse Source
This commit is contained in:
Steve Block
2012-08-15 04:15:07 -07:00
committed by Android (Google) Code Review
parent f8d9e2fccd c723e35336
commit 65dfac3bb5
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/webkit/CookieManager.java
View File

@@ -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
*/ */

5
core/java/android/webkit/WebView.java
View File

@@ -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