diff options
| author | Joe Onorato <joeo@android.com> | 2010-04-21 17:09:18 -0400 |
|---|---|---|
| committer | Joe Onorato <joeo@android.com> | 2010-04-21 17:09:18 -0400 |
| commit | 87d2ca8a66f1b1ed3693461c93ba2569c564529f (patch) | |
| tree | f5c83158f4304b513f748cbbaf2604c829eb0c22 /src/com | |
| parent | d65d08e709ec0916446100bae0a7276d0800382f (diff) | |
| download | android_packages_apps_Trebuchet-87d2ca8a66f1b1ed3693461c93ba2569c564529f.tar.gz android_packages_apps_Trebuchet-87d2ca8a66f1b1ed3693461c93ba2569c564529f.tar.bz2 android_packages_apps_Trebuchet-87d2ca8a66f1b1ed3693461c93ba2569c564529f.zip | |
Fix 2614384 - NPE in LauncherModel
Callbacks can be null.
Change-Id: I56462a54673b1804a6235d6d882008b453290542
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"); } } }); |