Merge "Fix NPE from onChildVisibilityChanged."

AOSP-10-CAF · Oct 11, 2018 · 20c6621 · 20c6621
2 parents 5fe2996 + 254c25f
commit 20c6621
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
@@ -14255,9 +14255,10 @@ void setFlags(int flags, int mask) {
             }
 
             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);
             }