am 1e1ccfb8: Merge "Fix a monkey bug with AbsListView data set observers" into jb-mr2-dev

* commit '1e1ccfb88bf2d78d8876022fae6c5058548406e7':
  Fix a monkey bug with AbsListView data set observers
This commit is contained in:
Adam Powell
2013-04-09 18:54:40 -07:00
committed by Android Git Automerger

View File

@@ -2606,7 +2606,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
mGlobalLayoutListenerAddedFilter = false;
}
if (mAdapter != null) {
if (mAdapter != null && mDataSetObserver != null) {
mAdapter.unregisterDataSetObserver(mDataSetObserver);
mDataSetObserver = null;
}