Merge "check for long and short component names." into ub-now-nova

2014-05-12 20:46:38 +00:00
parent e0aaa0d3de 0e584b5802
commit 418dcb881a
1 changed files with 4 additions and 2 deletions
@@ -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;