commit 5d33d5e552556feac5c2346d78d54c81072c9382
author Jean-Baptiste Queru <jbq@google.com> Tue Aug 21 13:01:09 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 21 13:01:09 2012 -0700
tree fed9b597f9a2516254171fc475e04eaea76b0dd9
parent e313559fbb2bcac7bc371896d40ea11a64141f32
parent 2996191189a9104852eedf1c97b68b0259579586

am 29961911: Merge "Fix music crash when search song."

* commit '2996191189a9104852eedf1c97b68b0259579586':
  Fix music crash when search song.

src/com/android/music/QueryBrowserActivity.java

diff --git a/src/com/android/music/QueryBrowserActivity.java b/src/com/android/music/QueryBrowserActivity.java
index 977650c..fb29a3d 100644
--- a/src/com/android/music/QueryBrowserActivity.java
+++ b/src/com/android/music/QueryBrowserActivity.java
@@ -210,7 +210,9 @@
         // Because we pass the adapter to the next activity, we need to make
         // sure it doesn't keep a reference to this activity. We can do this
         // by clearing its DatasetObservers, which setListAdapter(null) does.
-        setListAdapter(null);
+        if (getListView() != null) {
+            setListAdapter(null);
+        }
         mAdapter = null;
         super.onDestroy();
     }