commit 276e1b9d36f0a4bb4b9f96c152cebe4885324b54
author Sunny Goyal <sunnygoyal@google.com> Tue May 05 01:03:56 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue May 05 01:03:56 2015 +0000
tree 98edb25d130e39491dcbffb57c30678af0069e9f
parent f2a3ae5c2b67a59b374afb0795acf67ac183373a
parent 3290ec4cc220f97460b3b19f28adaf829ea971e1

am 3290ec4c: Preventing launcher crash because of invalid install shortcut intent

* commit '3290ec4cc220f97460b3b19f28adaf829ea971e1':
  Preventing launcher crash because of invalid install shortcut intent

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);
     }