diff options
| author | Ben Murdoch <benm@google.com> | 2012-05-24 18:02:56 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2012-05-24 18:02:56 +0100 |
| commit | b9fcb1334da057a99df61289a8cf12a38b536fac (patch) | |
| tree | aaa2b584a7e0caca9e07144db98f92689c55e776 /core/java/android/webkit/WebViewClassic.java | |
| parent | bb05da29e65ad99adcac68d0ffed237653cf6807 (diff) | |
| parent | cde7efde0c4084147989176ba8a0cda8c799f68d (diff) | |
resolved conflicts for merge of cde7efde to master
Change-Id: I44433670a897c23b3bd388cbba9cfacf80e3345f
Diffstat (limited to 'core/java/android/webkit/WebViewClassic.java')
| -rw-r--r-- | core/java/android/webkit/WebViewClassic.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java index c3b420e49e93..578eb2b018a7 100644 --- a/core/java/android/webkit/WebViewClassic.java +++ b/core/java/android/webkit/WebViewClassic.java @@ -8531,6 +8531,11 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc mWebView.postInvalidate(); } + // Note: must be called before first WebViewClassic is created. + public static void setShouldMonitorWebCoreThread() { + WebViewCore.setShouldMonitorWebCoreThread(); + } + private native void nativeCreate(int ptr, String drawableDir, boolean isHighEndGfx); private native void nativeDebugDump(); private native void nativeDestroy(); |