commit 3290ec4cc220f97460b3b19f28adaf829ea971e1
author Sunny Goyal <sunnygoyal@google.com> Mon May 04 13:53:42 2015 -0700
committer Sunny Goyal <sunnygoyal@google.com> Mon May 04 13:54:25 2015 -0700
tree da6ad78c11ef9063ec0e740eab63971f2151177c
parent 0be752ca6b168872dfe18c576b61c745e2395dec

Preventing launcher crash because of invalid install shortcut intent

Change-Id: Ibede31c8f018b17da5f272aa505a31f40a1b76f3

src/com/android/launcher3/InstallShortcutReceiver.java

diff --git a/src/com/android/launcher3/InstallShortcutReceiver.java b/src/com/android/launcher3/InstallShortcutReceiver.java
index 27dda64..23bcc85 100644
--- a/src/com/android/launcher3/InstallShortcutReceiver.java
+++ b/src/com/android/launcher3/InstallShortcutReceiver.java
@@ -146,10 +146,13 @@
             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);
     }