Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8a9ff20 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am b32ea255: am 7daaa98c: Merge "Fix issue #3149290:... 

am b32ea255: am 7daaa98c: Merge "Fix issue #3149290: java.lang.RuntimeException: Unable to pause activity" into gingerbread

* commit 'b32ea255':
  Fix issue #3149290: java.lang.RuntimeException: Unable to pause activity
parents 42c2d502 b32ea255

core/java/android/widget/AbsListView.java

+7 −3
Original line number Diff line number Diff line
@@ -1464,7 +1464,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te 


        SavedState ss = new SavedState(superState);



        boolean haveChildren = getChildCount() > 0;

        boolean haveChildren = getChildCount() > 0 && mItemCount > 0;

        long selectedId = getSelectedItemId();

        ss.selectedId = selectedId;

        ss.height = getHeight();
@@ -1479,8 +1479,12 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te 
                // Remember the position of the first child

                View v = getChildAt(0);

                ss.viewTop = v.getTop();

                ss.position = mFirstPosition;

                ss.firstId = mAdapter.getItemId(mFirstPosition);

                int firstPos = mFirstPosition;

                if (firstPos >= mItemCount) {

                    firstPos = mItemCount - 1;

                }

                ss.position = firstPos;

                ss.firstId = mAdapter.getItemId(firstPos);

            } else {

                ss.viewTop = 0;

                ss.firstId = INVALID_POSITION;