diff options
| author | Patrick Dubroy <dubroy@google.com> | 2011-02-28 12:58:39 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-28 12:58:39 -0800 |
| commit | 60b753b4cfa709efa55e05cdcd62a993330f3684 (patch) | |
| tree | 63e1885b4ee85d1339e8ee9251623fac6d309839 | |
| parent | c85b444079be05ac563df6ae2236c4328436d5a1 (diff) | |
| parent | f5afda70648505aadde6fbd64b06c9724a33460c (diff) | |
| download | android_packages_apps_Trebuchet-60b753b4cfa709efa55e05cdcd62a993330f3684.tar.gz android_packages_apps_Trebuchet-60b753b4cfa709efa55e05cdcd62a993330f3684.tar.bz2 android_packages_apps_Trebuchet-60b753b4cfa709efa55e05cdcd62a993330f3684.zip | |
Merge "Fix 3439835: NPE at com.android.launcher2.Launcher.bindAppsUpdated"
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 59f142a41..261569ef6 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); } |