commit 347bd48ef6e9a88056d27f7b9e6ae54442365e54
author Marco Nelissen <marcone@google.com> Tue Sep 15 13:18:31 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 15 13:18:31 2009 -0700
tree 452f558c7ba03df8a2de82059805fee3c09e25e8
parent 8b27fe527f58b5a9f2e718daa8f35aea6365cd48
parent 3c8b90d9eb149aae593c726893eb560900f302ab

am 3c8b90d9: Fix crash when reinstalling live wallpapers.

Merge commit '3c8b90d9eb149aae593c726893eb560900f302ab'

* commit '3c8b90d9eb149aae593c726893eb560900f302ab':
  Fix crash when reinstalling live wallpapers.

src/com/android/launcher2/LauncherModel.java

diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java
index b261a75..fae1d17 100644
--- a/src/com/android/launcher2/LauncherModel.java
+++ b/src/com/android/launcher2/LauncherModel.java
@@ -310,7 +310,7 @@
                 mAllAppsList.modified = new ArrayList();
             }
 
-            final Callbacks callbacks = mCallbacks.get();
+            final Callbacks callbacks = mCallbacks != null ? mCallbacks.get() : null;
             if (callbacks == null) {
                 return;
             }