diff options
| author | Primiano Tucci <primiano@google.com> | 2013-09-05 12:01:51 +0100 |
|---|---|---|
| committer | Bart Sears <bsears@google.com> | 2014-03-03 18:01:53 +0000 |
| commit | f4e272324424ad90a48c548644904b147466863c (patch) | |
| tree | a469678909abcc6e57dffd073b7c15c4e960a970 /core/java/android | |
| parent | 7ab82a0c602956251be9dd5539208af9cfecea33 (diff) | |
DO NOT MERGE: Adding freeMemoryForTests static method to WebView.
This is going to be used by pagecycler tests.
See: b/10629847
Change-Id: Ie3fda214e7808429d7ed63734ab301525f58513f
(cherry pick of 244267500254daff8745f8c0fae3edcac735873f)
Cherry pick to klp-dev as part of Bug: 13246014
Conflicts:
core/java/android/webkit/WebViewClassic.java
core/java/android/webkit/WebViewFactoryProvider.java
(cherry picked from commit 54daaf1cffddad6366fac2ccfceb1e042dd8e90e)
Change-Id: I8471ee5cfaac2ff72704c2391a1961f441aaa1e6
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/webkit/WebView.java | 10 | ||||
| -rw-r--r-- | core/java/android/webkit/WebViewFactoryProvider.java | 5 |
2 files changed, 15 insertions, 0 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 5bc39f158408..efdc465c2bd4 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -686,6 +686,16 @@ public class WebView extends AbsoluteLayout } /** + * Used only by internal tests to free up memory. + * + * @hide + */ + public static void freeMemoryForTests() { + checkThread(); + getFactory().getStatics().freeMemoryForTests(); + } + + /** * Informs WebView of the network state. This is used to set * the JavaScript property window.navigator.isOnline and * generates the online/offline event as specified in HTML5, sec. 5.7.7 diff --git a/core/java/android/webkit/WebViewFactoryProvider.java b/core/java/android/webkit/WebViewFactoryProvider.java index 9d9d88292c1a..e391aafd5465 100644 --- a/core/java/android/webkit/WebViewFactoryProvider.java +++ b/core/java/android/webkit/WebViewFactoryProvider.java @@ -50,6 +50,11 @@ public interface WebViewFactoryProvider { String getDefaultUserAgent(Context context); /** + * Used for tests only. + */ + void freeMemoryForTests(); + + /** * Implements the API method: * {@link android.webkit.WebView#setWebContentsDebuggingEnabled(boolean) } */ |