summaryrefslogtreecommitdiff
path: root/chromium/java/com/android/webview
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2013-10-07 23:48:54 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-10-07 23:48:54 +0000
commit91472035f666e633d4c299617ae1b20ccd3b6e0c (patch)
treea71d276d01359e15b3bb8c9523539977a7b3749f /chromium/java/com/android/webview
parent1bd0fb5f6962e25d89aa61e0f3098ac57c446fe8 (diff)
parent59a30ac62fdd1e22b59776547730ac8d8be68531 (diff)
downloadwebview-91472035f666e633d4c299617ae1b20ccd3b6e0c.tar.gz
Merge "Possible fix for bug b/11114227: Occasional crash on rotation" into klp-dev
Diffstat (limited to 'chromium/java/com/android/webview')
-rw-r--r--chromium/java/com/android/webview/chromium/WebViewChromium.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/chromium/java/com/android/webview/chromium/WebViewChromium.java b/chromium/java/com/android/webview/chromium/WebViewChromium.java
index 4a8ffdb..9d71c62 100644
--- a/chromium/java/com/android/webview/chromium/WebViewChromium.java
+++ b/chromium/java/com/android/webview/chromium/WebViewChromium.java
@@ -1616,7 +1616,8 @@ class WebViewChromium implements WebViewProvider,
@Override
public boolean performLongClick() {
- return mWebViewPrivate.super_performLongClick();
+ // Return false unless the WebView is attached to a View with a parent
+ return mWebView.getParent() != null ? mWebViewPrivate.super_performLongClick() : false;
}
@Override