diff options
| author | Romain Guy <romainguy@android.com> | 2010-05-19 21:13:20 -0700 |
|---|---|---|
| committer | Romain Guy <romainguy@android.com> | 2010-05-19 21:16:02 -0700 |
| commit | df36b0579e1e550de3d66a20362717e49b23235c (patch) | |
| tree | c1710877e3f8ed7c22551d7122a8722e97112c96 /core/java | |
| parent | cc92cea8fabf5eddaaebae609100b6e1e27213f8 (diff) | |
| download | frameworks_base-df36b0579e1e550de3d66a20362717e49b23235c.zip frameworks_base-df36b0579e1e550de3d66a20362717e49b23235c.tar.gz frameworks_base-df36b0579e1e550de3d66a20362717e49b23235c.tar.bz2 | |
Prevent crash when changing adapter.
Bug #2697842
Change-Id: I3f94c7907c8881145638b9e9307458f1431d7e57
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/widget/GridView.java | 2 | ||||
| -rw-r--r-- | core/java/android/widget/ListView.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/widget/GridView.java b/core/java/android/widget/GridView.java index 363e0a2..fe69a13 100644 --- a/core/java/android/widget/GridView.java +++ b/core/java/android/widget/GridView.java @@ -113,7 +113,7 @@ public class GridView extends AbsListView { */ @Override public void setAdapter(ListAdapter adapter) { - if (null != mAdapter) { + if (mAdapter != null && mDataSetObserver != null) { mAdapter.unregisterDataSetObserver(mDataSetObserver); } diff --git a/core/java/android/widget/ListView.java b/core/java/android/widget/ListView.java index 5382894..91f4946 100644 --- a/core/java/android/widget/ListView.java +++ b/core/java/android/widget/ListView.java @@ -415,7 +415,7 @@ public class ListView extends AbsListView { */ @Override public void setAdapter(ListAdapter adapter) { - if (mAdapter != null) { + if (mAdapter != null && mDataSetObserver != null) { mAdapter.unregisterDataSetObserver(mDataSetObserver); } |