commit 99aa13ec108e9cbb62984d79191548990809f95a
author Doris Liu <tianliu@google.com> Tue Jun 30 21:34:58 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 30 21:35:09 2015 +0000
tree f20052590b2be918d976e8ff6fc2bc6e4c8d37c0
parent ca985b54c8fe4d43f827f689fd4bd3008aa12977
parent f102d4266be803e16543c81df6f380bd4c447c86

Merge "Allow null child view when checking whether divider should draw" into mnc-dev

core/java/android/widget/LinearLayout.java

diff --git a/core/java/android/widget/LinearLayout.java b/core/java/android/widget/LinearLayout.java
index 4dcc242..b5e08ca 100644
--- a/core/java/android/widget/LinearLayout.java
+++ b/core/java/android/widget/LinearLayout.java
@@ -659,7 +659,8 @@
      */
     private boolean allViewsAreGoneBefore(int childIndex) {
         for (int i = childIndex - 1; i >= 0; i--) {
-            if (getVirtualChildAt(i).getVisibility() != GONE) {
+            View child = getVirtualChildAt(i);
+            if (child != null && child.getVisibility() != GONE) {
                 return false;
             }
         }