commit bd4a78937ffe2f37386dae4ae8817e33422c1267
author Adam Cohen <adamcohen@google.com> Fri Feb 06 23:29:32 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 06 23:29:32 2015 +0000
tree 21ddf3337c63fad78906f940061f36f234557db3
parent acbe9f6546455672b2edf51928d4fee4b6e246ba
parent e2d4ee1b21014e0f644134bd7c56291078b1ed60

Merge "Revert "Adding Launcher3 callbacks for trimming memory."" into ub-launcher3-almonte

src/com/android/launcher3/UninstallShortcutReceiver.java

diff --git a/src/com/android/launcher3/UninstallShortcutReceiver.java b/src/com/android/launcher3/UninstallShortcutReceiver.java
index ccea4ec..c9d0bb5 100644
--- a/src/com/android/launcher3/UninstallShortcutReceiver.java
+++ b/src/com/android/launcher3/UninstallShortcutReceiver.java
@@ -104,7 +104,9 @@
             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);