diff options
| -rw-r--r-- | src/com/android/launcher3/InstallShortcutReceiver.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/com/android/launcher3/InstallShortcutReceiver.java b/src/com/android/launcher3/InstallShortcutReceiver.java index 835c472d4..fb75161fe 100644 --- a/src/com/android/launcher3/InstallShortcutReceiver.java +++ b/src/com/android/launcher3/InstallShortcutReceiver.java @@ -294,7 +294,7 @@ public class InstallShortcutReceiver extends BroadcastReceiver { // Add the new apps to the model and bind them if (!addShortcuts.isEmpty()) { LauncherAppState app = LauncherAppState.getInstance(); - app.getModel().addAndBindAddedApps(context, addShortcuts, null); + app.getModel().addAndBindAddedApps(context, addShortcuts, new ArrayList<AppInfo>()); } } } diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index dff181426..ba1bcdb1e 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -282,7 +282,10 @@ public class LauncherModel extends BroadcastReceiver { addAndBindAddedApps(context, workspaceApps, cb, allAppsApps); } public void addAndBindAddedApps(final Context context, final ArrayList<ItemInfo> workspaceApps, - final Callbacks callbacks, final ArrayList<AppInfo> allAppsApps) { + final Callbacks callbacks, final ArrayList<AppInfo> allAppsApps) { + if (workspaceApps == null || allAppsApps == null) { + throw new RuntimeException("workspaceApps and allAppsApps must not be null"); + } if (workspaceApps.isEmpty() && allAppsApps.isEmpty()) { return; } @@ -1508,7 +1511,7 @@ public class LauncherModel extends BroadcastReceiver { } if (!added.isEmpty()) { Callbacks cb = mCallbacks != null ? mCallbacks.get() : null; - addAndBindAddedApps(context, added, cb, null); + addAndBindAddedApps(context, added, cb, new ArrayList<AppInfo>()); } } |