From 87d2ca8a66f1b1ed3693461c93ba2569c564529f Mon Sep 17 00:00:00 2001
From: Joe Onorato <joeo@android.com>
Date: Wed, 21 Apr 2010 17:09:18 -0400
Subject: Fix 2614384 - NPE in LauncherModel

Callbacks can be null.

Change-Id: I56462a54673b1804a6235d6d882008b453290542
---
 src/com/android/launcher2/LauncherModel.java | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'src/com')

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");
                                 }
                             }
                         });
-- 
cgit v1.2.3