commit 536f7db06c18d2622332f7f67002f323b71f1043
author Adam Cohen <adamcohen@google.com> Thu Aug 25 13:14:04 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 25 13:14:04 2011 -0700
tree 93889bbc5a8d90d56155dc652ecff799beadf0a5
parent de258f1eb0355cadb75ee0566f3624bff4930290
parent cfdf7ee64db8820d91a1cd82bf7b961fb2083dce

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

src/com/android/launcher2/LauncherModel.java

diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java
index b7f92ca..1f72299 100644
--- a/src/com/android/launcher2/LauncherModel.java
+++ b/src/com/android/launcher2/LauncherModel.java
@@ -607,7 +607,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();
+            }
         }
     }