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

2013-04-10 01:35:22 +00:00
parent 20495d2a9f bd1dd0d51a
commit 1e1ccfb88b
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/widget/AbsListView.java
+++ b/core/java/android/widget/AbsListView.java
@@ -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;
        }