commit cfdf7ee64db8820d91a1cd82bf7b961fb2083dce
author Winson Chung <winsonc@google.com> Thu Aug 25 11:38:34 2011 -0700
committer Winson Chung <winsonc@google.com> Thu Aug 25 11:38:56 2011 -0700
tree 86cb748c8274b6f4e47ad98876a109953ed7f304
parent cf0172d56c737c741f9cd62cb24020e9cd0de4a5

Adding null check to prevent crash when factory resetting device. (5214968)

Change-Id: I514a17bdf097c6df17cacbe6d3aa59d427bc713b

src/com/android/launcher2/LauncherModel.java

diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java
index 21c34bb..060bd66 100644
--- a/src/com/android/launcher2/LauncherModel.java
+++ b/src/com/android/launcher2/LauncherModel.java
@@ -588,7 +588,9 @@
         } else if (SearchManager.INTENT_GLOBAL_SEARCH_ACTIVITY_CHANGED.equals(action) ||
                    SearchManager.INTENT_ACTION_SEARCHABLES_CHANGED.equals(action)) {
             Callbacks callbacks = mCallbacks.get();
-            callbacks.bindSearchablesChanged();
+            if (callbacks != null) {
+                callbacks.bindSearchablesChanged();
+            }
         }
     }