diff options
| author | Selim Gurun <sgurun@android.com> | 2014-01-23 22:46:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-23 22:46:56 +0000 |
| commit | 2474ebe879e3ebeee17bb546f4349915b1f62e4f (patch) | |
| tree | 116c82768a0b8524b320ba0e9ce5cc7926b40ee8 /core/java | |
| parent | 647c5160a2cb4c917eea7ab325ec822e947a11c2 (diff) | |
| parent | 0a33c4f9f54b59dac4e745e09db05990d53a1aba (diff) | |
| download | frameworks_base-2474ebe879e3ebeee17bb546f4349915b1f62e4f.zip frameworks_base-2474ebe879e3ebeee17bb546f4349915b1f62e4f.tar.gz frameworks_base-2474ebe879e3ebeee17bb546f4349915b1f62e4f.tar.bz2 | |
am 0a33c4f9: am 6735020a: am d261243c: am a3106d1d: Merge "Revert "Adding freeMemoryForTests static method to WebView.""
* commit '0a33c4f9f54b59dac4e745e09db05990d53a1aba':
Revert "Adding freeMemoryForTests static method to WebView."
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/webkit/WebView.java | 9 | ||||
| -rw-r--r-- | core/java/android/webkit/WebViewFactoryProvider.java | 5 |
2 files changed, 0 insertions, 14 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index f276e14..5bc39f1 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -686,15 +686,6 @@ 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 e391aaf..9d9d882 100644 --- a/core/java/android/webkit/WebViewFactoryProvider.java +++ b/core/java/android/webkit/WebViewFactoryProvider.java @@ -50,11 +50,6 @@ public interface WebViewFactoryProvider { String getDefaultUserAgent(Context context); /** - * Used for tests only. - */ - void freeMemoryForTests(); - - /** * Implements the API method: * {@link android.webkit.WebView#setWebContentsDebuggingEnabled(boolean) } */ |