summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorJeff Hamilton <jham@google.com>2011-01-17 11:03:40 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-17 11:03:40 -0800
commitb01856da54892647afed260d017352d58648acc3 (patch)
tree3d2e8597fb5dc1dd0a0b8a313e86720411c4895d /core/java/android
parent9ed99405ae8cdd9038071a872e7d92cf256f2165 (diff)
parentfd119e986d531345c2df3022ea9d968bb7fd3858 (diff)
Merge "Delivering null cursor to loader callbacks." into honeycomb
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/app/LoaderManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/LoaderManager.java b/core/java/android/app/LoaderManager.java
index 5f8c0984982d..1ef011c31646 100644
--- a/core/java/android/app/LoaderManager.java
+++ b/core/java/android/app/LoaderManager.java
@@ -353,7 +353,7 @@ class LoaderManagerImpl extends LoaderManager {
// 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);