Merge "fix 'int android.view.View.getHeight()' on a null object reference" am: 4add708b91

am: 6a5d589a50 Change-Id: I44fc06d18b963b01ef2c894d515567bb7aac2620
2019-03-08 07:24:54 -08:00
parent 836402e0e8 6a5d589a50
commit 3069e2ba6f
1 changed files with 5 additions and 0 deletions
--- a/core/java/android/widget/AbsListView.java
+++ b/core/java/android/widget/AbsListView.java
@@ -7700,6 +7700,11 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
                mLastSeenPos = firstPos;

                final int childCount = getChildCount();
+
+                if (childCount <= 0) {
+                    return;
+                }
+
                final int position = mTargetPos;
                final int lastPos = firstPos + childCount - 1;