From d919882006a457d16dea46bd546472e6534b5c19 Mon Sep 17 00:00:00 2001 From: Adam Cohen Date: Tue, 22 Nov 2011 16:42:47 -0800 Subject: Prevent the creation of Shorcuts with null intents (issue 5629292) Change-Id: I54fbad2d4af27c6d8fc0d79c33e890298a3db4dc --- src/com/android/launcher2/LauncherModel.java | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/com/android/launcher2/LauncherModel.java') diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java index 1755903ec..50a36a5b7 100644 --- a/src/com/android/launcher2/LauncherModel.java +++ b/src/com/android/launcher2/LauncherModel.java @@ -1772,6 +1772,9 @@ public class LauncherModel extends BroadcastReceiver { ShortcutInfo addShortcut(Context context, Intent data, long container, int screen, int cellX, int cellY, boolean notify) { final ShortcutInfo info = infoFromShortcutIntent(context, data, null); + if (info == null) { + return null; + } addItemToDatabase(context, info, container, screen, cellX, cellY, notify); return info; @@ -1835,6 +1838,12 @@ public class LauncherModel extends BroadcastReceiver { String name = data.getStringExtra(Intent.EXTRA_SHORTCUT_NAME); Parcelable bitmap = data.getParcelableExtra(Intent.EXTRA_SHORTCUT_ICON); + if (intent == null) { + // If the intent is null, we can't construct a valid ShortcutInfo, so we return null + Log.e(TAG, "Can't construct ShorcutInfo with null intent"); + return null; + } + Bitmap icon = null; boolean customIcon = false; ShortcutIconResource iconResource = null; -- cgit v1.2.3