commit 1e1ccfb88bf2d78d8876022fae6c5058548406e7
author Adam Powell <adamp@google.com> Wed Apr 10 01:35:22 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 10 01:35:22 2013 +0000
tree 970fee7a4f9c955962d381d484e9b6f4e3ebb967
parent 20495d2a9fddfe712e04bde6a056f9fb058876d5
parent bd1dd0d51ae07f4fc5de5ec0004e7e40ed205022

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

core/java/android/widget/AbsListView.java

diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java
index 3fa0940..94dadb4 100644
--- a/core/java/android/widget/AbsListView.java
+++ b/core/java/android/widget/AbsListView.java
@@ -2606,7 +2606,7 @@
             mGlobalLayoutListenerAddedFilter = false;
         }
 
-        if (mAdapter != null) {
+        if (mAdapter != null && mDataSetObserver != null) {
             mAdapter.unregisterDataSetObserver(mDataSetObserver);
             mDataSetObserver = null;
         }