commit aa45fe2c00a84f96fb90a298b99da9b714b3ee0a
author Jeremy Walker <jewalker@google.com> Mon Jul 22 20:44:06 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 22 20:44:06 2024 +0000
tree e2fc683755df0f730ab69a828ddbcf30c4fa2a21
parent 03b7df4aa78521f3288717d62c6ec2d22609f885
parent 4d7a2b0c3720ed0fc1a32b156cd0ea7edfb91624

Merge "Fixes NPE when child is null." into main

core/java/android/view/ViewGroup.java

diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
index b2c39b1..ceaca22 100644
--- a/core/java/android/view/ViewGroup.java
+++ b/core/java/android/view/ViewGroup.java
@@ -2798,9 +2798,10 @@
                     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;
                         }