diff options
| author | Adam Powell <adamp@google.com> | 2013-04-09 18:58:06 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-09 18:58:06 -0700 |
| commit | dc614479fe347f005cde25a464be0c53da4e929b (patch) | |
| tree | 4c4746083ef6309569feb884e93537c9b5676d52 /core/java/android/widget | |
| parent | 269ac93fe887506a166d5bc259be9df415517270 (diff) | |
| parent | a26ec11a1e5e95bd7704be59d75145ba48d1ee6d (diff) | |
| download | frameworks_base-dc614479fe347f005cde25a464be0c53da4e929b.zip frameworks_base-dc614479fe347f005cde25a464be0c53da4e929b.tar.gz frameworks_base-dc614479fe347f005cde25a464be0c53da4e929b.tar.bz2 | |
am a26ec11a: am 1e1ccfb8: Merge "Fix a monkey bug with AbsListView data set observers" into jb-mr2-dev
* commit 'a26ec11a1e5e95bd7704be59d75145ba48d1ee6d':
Fix a monkey bug with AbsListView data set observers
Diffstat (limited to 'core/java/android/widget')
| -rw-r--r-- | core/java/android/widget/AbsListView.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te mGlobalLayoutListenerAddedFilter = false; } - if (mAdapter != null) { + if (mAdapter != null && mDataSetObserver != null) { mAdapter.unregisterDataSetObserver(mDataSetObserver); mDataSetObserver = null; } |