From 0e584b5802823091ef47dc165af5afbbe2c0ae42 Mon Sep 17 00:00:00 2001
From: Chris Wren <cwren@android.com>
Date: Mon, 12 May 2014 16:07:25 -0400
Subject: [PATCH] check for long and short component names.

Bug: 14650346
Change-Id: Ic2195a4f60b63f8ec85c42284e0fd58d6f473a9f
---
 src/com/android/launcher3/LauncherModel.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 8af0970415..585c238c33 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -853,10 +853,12 @@ public class LauncherModel extends BroadcastReceiver
             return false;
         }
         String componentName = component.flattenToString();
+        String shortName = component.flattenToShortString();
         long serialNumber = UserManagerCompat.getInstance(context)
                 .getSerialNumberForUser(user);
-        final String where = "intent glob \"*component=" + componentName + "*\" and restored = 1"
-                + " and profileId = " + serialNumber;
+        final String where = "(intent glob \"*component=" + componentName + "*\" or " +
+                "intent glob \"*component=" + shortName + "*\")" +
+                "and restored = 1 and profileId = " + serialNumber;
         Cursor c = cr.query(LauncherSettings.Favorites.CONTENT_URI,
                 new String[]{"intent", "restored", "profileId"}, where, null, null);
         boolean result = false;