summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2011-08-29 11:31:33 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-29 11:31:33 -0700
commitfe1f9b0bd47c611333d1f14261be80ffac08d152 (patch)
treebb9c9cfbcfba7e605b89484fe7c0538ea0a63788
parent63feae2ca9473426897d64c60349f113fb7231b9 (diff)
parentec9788e6819a24ef5dc8fe4edf44f280e4a703fe (diff)
downloadandroid_packages_apps_Trebuchet-fe1f9b0bd47c611333d1f14261be80ffac08d152.tar.gz
android_packages_apps_Trebuchet-fe1f9b0bd47c611333d1f14261be80ffac08d152.tar.bz2
android_packages_apps_Trebuchet-fe1f9b0bd47c611333d1f14261be80ffac08d152.zip
Merge "Fix crash when package list is updated"
-rw-r--r--src/com/android/launcher2/LauncherModel.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java
index 7d6206222..4ad8922f4 100644
--- a/src/com/android/launcher2/LauncherModel.java
+++ b/src/com/android/launcher2/LauncherModel.java
@@ -605,9 +605,11 @@ public class LauncherModel extends BroadcastReceiver {
startLoaderFromBackground();
} else if (SearchManager.INTENT_GLOBAL_SEARCH_ACTIVITY_CHANGED.equals(action) ||
SearchManager.INTENT_ACTION_SEARCHABLES_CHANGED.equals(action)) {
- Callbacks callbacks = mCallbacks.get();
- if (callbacks != null) {
- callbacks.bindSearchablesChanged();
+ if (mCallbacks != null) {
+ Callbacks callbacks = mCallbacks.get();
+ if (callbacks != null) {
+ callbacks.bindSearchablesChanged();
+ }
}
}
}