Preventing launcher crash because of invalid install shortcut intent

Change-Id: Ibede31c8f018b17da5f272aa505a31f40a1b76f3
2015-05-04 13:53:42 -07:00
parent 0be752ca6b
commit 3290ec4cc2
1 changed files with 5 additions and 2 deletions
@@ -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);
    }