From cfdf7ee64db8820d91a1cd82bf7b961fb2083dce Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Thu, 25 Aug 2011 11:38:34 -0700
Subject: Adding null check to prevent crash when factory resetting device.
 (5214968)

Change-Id: I514a17bdf097c6df17cacbe6d3aa59d427bc713b
---
 src/com/android/launcher2/LauncherModel.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java
index 21c34bb92..060bd66bc 100644
--- a/src/com/android/launcher2/LauncherModel.java
+++ b/src/com/android/launcher2/LauncherModel.java
@@ -588,7 +588,9 @@ public class LauncherModel extends BroadcastReceiver {
         } 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();
+            }
         }
     }
 
-- 
cgit v1.2.3