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

Commit 31a95862 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fixed null pointer exception" into main am: 355524bd 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3075185



Change-Id: I7eb7c9468bb62f26a436099a5dcb4bd0de34eef5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a11b31ee 355524bd

core/java/android/view/ViewGroup.java

+5 −0
Original line number Diff line number Diff line
@@ -4490,6 +4490,11 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
        final View[] children = mChildren;

        for (int i = 0; i < count; i++) {

            final View child = children[i];

            if (child == null) {

                throw new IllegalStateException(getClass().getSimpleName() + " contains null " +

                        "child at index " + i + " when traversal in dispatchGetDisplayList," +

                        " the view may have been removed.");

            }

            if (((child.mViewFlags & VISIBILITY_MASK) == VISIBLE || child.getAnimation() != null)) {

                recreateChildDisplayList(child);

            }