DO NOT MERGE

cherry-pick https://android-git.corp.google.com/g/#change,39258 from master

Now mSupportMultiTouch is depending on WebSettings,
it can't be static any more.

Fix http://b/issue?id=2413364

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index ecee0d0..c5c14d3 100644 (file)
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -434,7 +434,7 @@ public class WebView extends AbsoluteLayout
     private boolean mWrapContent;
 
     // whether support multi-touch
-    private static boolean mSupportMultiTouch;
+    private boolean mSupportMultiTouch;
     // use the framework's ScaleGestureDetector to handle multi-touch
     private ScaleGestureDetector mScaleDetector;
     // minimum scale change during multi-touch zoom