From 244267500254daff8745f8c0fae3edcac735873f Mon Sep 17 00:00:00 2001 From: Primiano Tucci Date: Thu, 5 Sep 2013 12:01:51 +0100 Subject: [PATCH] Adding freeMemoryForTests static method to WebView. This is going to be used by pagecycler tests. See: b/10629847 Change-Id: Ie3fda214e7808429d7ed63734ab301525f58513f --- core/java/android/webkit/WebView.java | 10 ++++++++++ core/java/android/webkit/WebViewClassic.java | 4 ++++ core/java/android/webkit/WebViewFactoryProvider.java | 5 +++++ 3 files changed, 19 insertions(+) diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 20c67a548387..0064c3a8ecec 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -711,6 +711,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/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java index 4811ca57ccc1..c82a760bd8d4 100644 --- a/core/java/android/webkit/WebViewClassic.java +++ b/core/java/android/webkit/WebViewClassic.java @@ -1320,6 +1320,10 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc WebViewClassic.disablePlatformNotifications(); } } + @Override + public void freeMemoryForTests() { + // noop. + } @Override public Statics getStatics() { return this; } diff --git a/core/java/android/webkit/WebViewFactoryProvider.java b/core/java/android/webkit/WebViewFactoryProvider.java index 934ef83db185..0f3aeb0c9f19 100644 --- a/core/java/android/webkit/WebViewFactoryProvider.java +++ b/core/java/android/webkit/WebViewFactoryProvider.java @@ -48,6 +48,11 @@ public interface WebViewFactoryProvider { * {@link android.webkit.WebSettings#getDefaultUserAgent(Context) } */ String getDefaultUserAgent(Context context); + + /** + * Used for tests only. + */ + void freeMemoryForTests(); } Statics getStatics(); -- 2.11.0