summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2011-08-25 11:38:34 -0700
committerWinson Chung <winsonc@google.com>2011-08-25 11:38:56 -0700
commitcfdf7ee64db8820d91a1cd82bf7b961fb2083dce (patch)
tree86cb748c8274b6f4e47ad98876a109953ed7f304 /src
parentcf0172d56c737c741f9cd62cb24020e9cd0de4a5 (diff)
downloadandroid_packages_apps_Trebuchet-cfdf7ee64db8820d91a1cd82bf7b961fb2083dce.tar.gz
android_packages_apps_Trebuchet-cfdf7ee64db8820d91a1cd82bf7b961fb2083dce.tar.bz2
android_packages_apps_Trebuchet-cfdf7ee64db8820d91a1cd82bf7b961fb2083dce.zip
Adding null check to prevent crash when factory resetting device. (5214968)
Change-Id: I514a17bdf097c6df17cacbe6d3aa59d427bc713b
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/LauncherModel.java4
1 files changed, 3 insertions, 1 deletions
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();
+ }
}
}