From 4802b4107a66bc86996083b4835d1094ef4f4cbb Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Wed, 4 Feb 2015 10:05:05 -0800
Subject: [PATCH] Adding null-check before parsing an intent

Bug: 18962665
Change-Id: Iae02435f019fa205f3ee3ae721a29f26b3b56dd2
---
 src/com/android/launcher3/UninstallShortcutReceiver.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/UninstallShortcutReceiver.java b/src/com/android/launcher3/UninstallShortcutReceiver.java
index ccea4ec0c3..c9d0bb5f56 100644
--- a/src/com/android/launcher3/UninstallShortcutReceiver.java
+++ b/src/com/android/launcher3/UninstallShortcutReceiver.java
@@ -104,7 +104,9 @@ public class UninstallShortcutReceiver extends BroadcastReceiver {
             try {
                 while (c.moveToNext()) {
                     try {
-                        if (intent.filterEquals(Intent.parseUri(c.getString(intentIndex), 0))) {
+                        String intentStr = c.getString(intentIndex);
+                        if (intentStr != null
+                                && intent.filterEquals(Intent.parseUri(intentStr, 0))) {
                             final long id = c.getLong(idIndex);
                             final Uri uri = LauncherSettings.Favorites.getContentUri(id, false);
                             cr.delete(uri, null, null);