From f5afda70648505aadde6fbd64b06c9724a33460c Mon Sep 17 00:00:00 2001
From: Patrick Dubroy <dubroy@google.com>
Date: Mon, 28 Feb 2011 12:04:18 -0800
Subject: [PATCH] Fix 3439835: NPE at
 com.android.launcher2.Launcher.bindAppsUpdated

Change-Id: Id9002f7fe8dbc2bd8631a3dc2344df759d7440a3
---
 src/com/android/launcher2/Launcher.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 59f142a418..261569ef64 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -3567,8 +3567,12 @@ public final class Launcher extends Activity
     public void bindAppsUpdated(ArrayList<ApplicationInfo> apps) {
         setLoadOnResume();
         removeDialog(DIALOG_CREATE_SHORTCUT);
-        mWorkspace.updateShortcuts(apps);
-        mAllAppsGrid.updateApps(apps);
+        if (mWorkspace != null) {
+            mWorkspace.updateShortcuts(apps);
+        }
+        if (mAllAppsGrid != null) {
+            mAllAppsGrid.updateApps(apps);
+        }
         if (mCustomizePagedView != null) {
             mCustomizePagedView.updateApps(apps);
         }