commit d0dbee21505b7aaa05e65d41792a2b47249f0110
author Jeff Hamilton <jham@google.com> Mon Jan 17 11:40:52 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Jan 17 11:40:52 2011 -0800
tree 058581b37dbc92081d3a910c1c8fe463ef5a840a
parent b7d33124494f146e0a835c2862f6de96d0e379d8
parent b01856da54892647afed260d017352d58648acc3

am b01856da: Merge "Delivering null cursor to loader callbacks." into honeycomb

* commit 'b01856da54892647afed260d017352d58648acc3':
  Delivering null cursor to loader callbacks.

core/java/android/app/LoaderManager.java

diff --git a/core/java/android/app/LoaderManager.java b/core/java/android/app/LoaderManager.java
index 5f8c098..1ef011c 100644
--- a/core/java/android/app/LoaderManager.java
+++ b/core/java/android/app/LoaderManager.java
@@ -353,7 +353,7 @@
             
             // Notify of the new data so the app can switch out the old data before
             // we try to destroy it.
-            if (mData != data) {
+            if (data == null || mData != data) {
                 mData = data;
                 if (mStarted) {
                     callOnLoadFinished(loader, data);