Merge "Fixed a regression setting ListView selection mode without an adapter" (73e0546c) · Commits · e / os / android_frameworks_base

core/java/android/widget/ListView.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -455,6 +455,12 @@ public class ListView extends AbsListView {
		checkSelectionChanged();
		}

		if (mChoiceMode != CHOICE_MODE_NONE &&
		mAdapter.hasStableIds() &&
		mCheckedIdStates == null) {
		mCheckedIdStates = new LongSparseArray<Boolean>();
		}

		} else {
		mAreAllItemsSelectable = true;
		checkFocus();
		@@ -3320,7 +3326,7 @@ public class ListView extends AbsListView {
		if (mCheckStates == null) {
		mCheckStates = new SparseBooleanArray();
		}
		if (mCheckedIdStates == null && mAdapter.hasStableIds()) {
		if (mCheckedIdStates == null && mAdapter != null && mAdapter.hasStableIds()) {
		mCheckedIdStates = new LongSparseArray<Boolean>();
		}
		}