diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-05-04 13:53:42 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2015-05-04 13:54:25 -0700 |
| commit | 3290ec4cc220f97460b3b19f28adaf829ea971e1 (patch) | |
| tree | da6ad78c11ef9063ec0e740eab63971f2151177c /src/com/android/launcher3/InstallShortcutReceiver.java | |
| parent | 0be752ca6b168872dfe18c576b61c745e2395dec (diff) | |
| download | android_packages_apps_Trebuchet-3290ec4cc220f97460b3b19f28adaf829ea971e1.tar.gz android_packages_apps_Trebuchet-3290ec4cc220f97460b3b19f28adaf829ea971e1.tar.bz2 android_packages_apps_Trebuchet-3290ec4cc220f97460b3b19f28adaf829ea971e1.zip | |
Preventing launcher crash because of invalid install shortcut intent
Change-Id: Ibede31c8f018b17da5f272aa505a31f40a1b76f3
Diffstat (limited to 'src/com/android/launcher3/InstallShortcutReceiver.java')
| -rw-r--r-- | src/com/android/launcher3/InstallShortcutReceiver.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/launcher3/InstallShortcutReceiver.java b/src/com/android/launcher3/InstallShortcutReceiver.java index 27dda6404..23bcc8577 100644 --- a/src/com/android/launcher3/InstallShortcutReceiver.java +++ b/src/com/android/launcher3/InstallShortcutReceiver.java @@ -146,10 +146,13 @@ public class InstallShortcutReceiver extends BroadcastReceiver { return; } - if (DBG) Log.d(TAG, "Got INSTALL_SHORTCUT: " + data.toUri(0)); PendingInstallShortcutInfo info = new PendingInstallShortcutInfo(data, context); - info = convertToLauncherActivityIfPossible(info); + if (info.launchIntent == null || info.label == null) { + if (DBG) Log.e(TAG, "Invalid install shortcut intent"); + return; + } + info = convertToLauncherActivityIfPossible(info); queuePendingShortcutInfo(info, context); } |