OSDN Git Service

Fix 3439835: NPE at com.android.launcher2.Launcher.bindAppsUpdated
authorPatrick Dubroy <dubroy@google.com>
Mon, 28 Feb 2011 20:04:18 +0000 (12:04 -0800)
committerPatrick Dubroy <dubroy@google.com>
Mon, 28 Feb 2011 20:04:18 +0000 (12:04 -0800)
Change-Id: Id9002f7fe8dbc2bd8631a3dc2344df759d7440a3

src/com/android/launcher2/Launcher.java

index 59f142a..261569e 100644 (file)
@@ -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);
         }