Merge "Protect against bogus input for ListViews" into jb-dev (4c38fe36) · Commits · e / os / android_frameworks_base

core/java/android/widget/AbsListView.java

+16 −0

Original line number	Diff line number	Diff line
		@@ -3351,6 +3351,14 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
		mPositionScroller.stop();
		}

		if (!mIsAttached) {
		// Something isn't right.
		// Since we rely on being attached to get data set change notifications,
		// don't risk doing anything where we might try to resync and find things
		// in a bogus state.
		return false;
		}

		if (mFastScroller != null) {
		boolean intercepted = mFastScroller.onTouchEvent(ev);
		if (intercepted) {
		@@ -3846,6 +3854,14 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
		mPositionScroller.stop();
		}

		if (!mIsAttached) {
		// Something isn't right.
		// Since we rely on being attached to get data set change notifications,
		// don't risk doing anything where we might try to resync and find things
		// in a bogus state.
		return false;
		}

		if (mFastScroller != null) {
		boolean intercepted = mFastScroller.onInterceptTouchEvent(ev);
		if (intercepted) {

+3 −0

Original line number	Diff line number	Diff line
		@@ -88,6 +88,9 @@ public class ListMenuPresenter implements MenuPresenter, AdapterView.OnItemClick
		}
		}
		mMenu = menu;
		if (mAdapter != null) {
		mAdapter.notifyDataSetChanged();
		}
		}

		@Override