Merge "Fixes NPE when child is null." into main (aa45fe2c) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewGroup.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -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)
		final boolean cancelChild =
		(target.child != null && resetCancelNextUpFlag(target.child))
		\|\| intercepted;
		if (dispatchTransformedTouchEvent(ev, cancelChild,
		if (target.child != null && dispatchTransformedTouchEvent(ev, cancelChild,
		target.child, target.pointerIdBits)) {
		handled = true;
		}