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

Commit 20c6621d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE from onChildVisibilityChanged."

parents 5fe29966 254c25f3

core/java/android/view/View.java

+4 −3
Original line number Diff line number Diff line
@@ -14255,9 +14255,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
            }















            if (mParent instanceof ViewGroup) {













                ((ViewGroup) mParent).onChildVisibilityChanged(this,













                        (changed & VISIBILITY_MASK), newVisibility);













                ((View) mParent).invalidate(true);













                ViewGroup parent = (ViewGroup) mParent;













                parent.onChildVisibilityChanged(this, (changed & VISIBILITY_MASK),













                        newVisibility);













                parent.invalidate(true);















            } else if (mParent != null) {















                mParent.invalidateChild(this, null);















            }