Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d7a2b0c authored by Jeremy Walker's avatar Jeremy Walker
Browse files

Fixes NPE when child is null. 

Bug: 335395179
Test: Uses existing tests
Flag: EXEMPT bugfix - null check only
Change-Id: I771c2be88ef891da6ebb3435560bc391428f9aec
parent c7c02412

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;

                        }