diff options
| -rw-r--r-- | core/java/android/view/ViewGroup.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index b2c39b13525f..ceaca2257af4 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -2798,9 +2798,10 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager if (alreadyDispatchedToNewTouchTarget && target == newTouchTarget) { handled = true; } else { - final boolean cancelChild = resetCancelNextUpFlag(target.child) - || intercepted; - if (dispatchTransformedTouchEvent(ev, cancelChild, + final boolean cancelChild = + (target.child != null && resetCancelNextUpFlag(target.child)) + || intercepted; + if (target.child != null && dispatchTransformedTouchEvent(ev, cancelChild, target.child, target.pointerIdBits)) { handled = true; } |