diff options
| author | Adam Cohen <adamcohen@google.com> | 2011-08-25 13:14:04 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-25 13:14:04 -0700 |
| commit | 536f7db06c18d2622332f7f67002f323b71f1043 (patch) | |
| tree | 93889bbc5a8d90d56155dc652ecff799beadf0a5 /src | |
| parent | de258f1eb0355cadb75ee0566f3624bff4930290 (diff) | |
| parent | cfdf7ee64db8820d91a1cd82bf7b961fb2083dce (diff) | |
| download | android_packages_apps_Trebuchet-536f7db06c18d2622332f7f67002f323b71f1043.tar.gz android_packages_apps_Trebuchet-536f7db06c18d2622332f7f67002f323b71f1043.tar.bz2 android_packages_apps_Trebuchet-536f7db06c18d2622332f7f67002f323b71f1043.zip | |
Merge "Adding null check to prevent crash when factory resetting device. (5214968)"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/LauncherModel.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java index b7f92ca47..1f722994c 100644 --- a/src/com/android/launcher2/LauncherModel.java +++ b/src/com/android/launcher2/LauncherModel.java @@ -607,7 +607,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(); + } } } |