Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "b/3340946 Fix NPE caused by null gesture detector." into honeycomb

Browse Source
This commit is contained in:
Huahui Wu
2011-01-12 10:57:51 -08:00
committed by Android (Google) Code Review
parent 6014527c35 8465cc9d88
commit 342bfbf94f
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/webkit/WebView.java
View File

@@ -5536,8 +5536,9 @@ public class WebView extends AbsoluteLayout
+ "mPreventDefault = " + mPreventDefault + "mPreventDefault = " + mPreventDefault
+ " mDeferTouchProcess = " + mDeferTouchProcess + " mDeferTouchProcess = " + mDeferTouchProcess
+ " mTouchMode = " + mTouchMode); + " mTouchMode = " + mTouchMode);
} else {
mVelocityTracker.addMovement(ev);
} }
mVelocityTracker.addMovement(ev);
if (mSelectingText && mSelectionStarted) { if (mSelectingText && mSelectionStarted) {
if (DebugFlags.WEB_VIEW) { if (DebugFlags.WEB_VIEW) {
Log.v(LOGTAG, "extend=" + contentX + "," + contentY); Log.v(LOGTAG, "extend=" + contentX + "," + contentY);
@@ -5776,8 +5777,9 @@ public class WebView extends AbsoluteLayout
+ mPreventDefault + mPreventDefault
+ " mDeferTouchProcess = " + " mDeferTouchProcess = "
+ mDeferTouchProcess); + mDeferTouchProcess);
} else {
mVelocityTracker.addMovement(ev);
} }
mVelocityTracker.addMovement(ev);
// set to MOTIONLESS_IGNORE so that it won't keep // set to MOTIONLESS_IGNORE so that it won't keep
// removing and sending message in // removing and sending message in
// drawCoreAndCursorRing() // drawCoreAndCursorRing()
@@ -5852,6 +5854,11 @@ public class WebView extends AbsoluteLayout
final ScaleGestureDetector detector = final ScaleGestureDetector detector =
mZoomManager.getMultiTouchGestureDetector(); mZoomManager.getMultiTouchGestureDetector();
// A few apps use WebView but don't instantiate gesture detector.
// We don't need to support multi touch for them.
if (detector == null) return false;
int action = ev.getAction(); int action = ev.getAction();
float x = ev.getX(); float x = ev.getX();
float y = ev.getY(); float y = ev.getY();