summaryrefslogtreecommitdiffstats
path: root/core/java/android/widget/LinearLayout.java
diff options
context:
space:
mode:
Diffstat (limited to 'core/java/android/widget/LinearLayout.java')
-rw-r--r--core/java/android/widget/LinearLayout.java3
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;
}
}