diff options
| author | Doris Liu <tianliu@google.com> | 2015-06-30 21:34:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-30 21:35:09 +0000 |
| commit | 99aa13ec108e9cbb62984d79191548990809f95a (patch) | |
| tree | f20052590b2be918d976e8ff6fc2bc6e4c8d37c0 /core/java | |
| parent | ca985b54c8fe4d43f827f689fd4bd3008aa12977 (diff) | |
| parent | f102d4266be803e16543c81df6f380bd4c447c86 (diff) | |
| download | frameworks_base-99aa13ec108e9cbb62984d79191548990809f95a.zip frameworks_base-99aa13ec108e9cbb62984d79191548990809f95a.tar.gz frameworks_base-99aa13ec108e9cbb62984d79191548990809f95a.tar.bz2 | |
Merge "Allow null child view when checking whether divider should draw" into mnc-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/widget/LinearLayout.java | 3 |
1 files changed, 2 insertions, 1 deletions
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 @@ public class LinearLayout extends ViewGroup { */ 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; } } |