commit f5afda70648505aadde6fbd64b06c9724a33460c
author Patrick Dubroy <dubroy@google.com> Mon Feb 28 12:04:18 2011 -0800
committer Patrick Dubroy <dubroy@google.com> Mon Feb 28 12:04:18 2011 -0800
tree 20d10d87a73ff0368d514c8b5d3744fd9ddcc25d
parent 1908d07151e0d3f82899f368874e41ed1e49ba16

Fix 3439835: NPE at com.android.launcher2.Launcher.bindAppsUpdated

Change-Id: Id9002f7fe8dbc2bd8631a3dc2344df759d7440a3

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 59f142a..261569e 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -3567,8 +3567,12 @@
     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);
         }