diff options
| author | Joe Onorato <joeo@android.com> | 2010-04-21 14:20:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-21 14:20:28 -0700 |
| commit | ef03a7d293e9f79975c12558bcb76c710b8952c6 (patch) | |
| tree | 535c9464a914cff897eff9a40b9f2f7a293333e8 /src/com | |
| parent | 2a50d89f40f0aac0bc62f4fba6ceb5654b7d5c99 (diff) | |
| parent | 87d2ca8a66f1b1ed3693461c93ba2569c564529f (diff) | |
| download | android_packages_apps_Trebuchet-ef03a7d293e9f79975c12558bcb76c710b8952c6.tar.gz android_packages_apps_Trebuchet-ef03a7d293e9f79975c12558bcb76c710b8952c6.tar.bz2 android_packages_apps_Trebuchet-ef03a7d293e9f79975c12558bcb76c710b8952c6.zip | |
am 87d2ca8a: Fix 2614384 - NPE in LauncherModel
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/launcher2/LauncherModel.java | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java index a19eb4c3b..a521d67a9 100644 --- a/src/com/android/launcher2/LauncherModel.java +++ b/src/com/android/launcher2/LauncherModel.java @@ -1103,15 +1103,19 @@ public class LauncherModel extends BroadcastReceiver { public void run() { final long t = SystemClock.uptimeMillis(); final Callbacks callbacks = tryGetCallbacks(oldCallbacks); - if (first) { - mBeforeFirstLoad = false; - callbacks.bindAllApplications(added); + if (callbacks != null) { + if (first) { + mBeforeFirstLoad = false; + callbacks.bindAllApplications(added); + } else { + callbacks.bindAppsAdded(added); + } + if (DEBUG_LOADERS) { + Log.d(TAG, "bound " + added.size() + " apps in " + + (SystemClock.uptimeMillis() - t) + "ms"); + } } else { - callbacks.bindAppsAdded(added); - } - if (DEBUG_LOADERS) { - Log.d(TAG, "bound " + added.size() + " apps in " - + (SystemClock.uptimeMillis() - t) + "ms"); + Log.i(TAG, "not binding apps: no Launcher activity"); } } }); |