am 04960cd2: Merge "also backup icon assets for shortcuts." into ub-now-mister-ugly

* commit '04960cd2e5968e83b26f4fbab23713a5d62af2fc':
  also backup icon assets for shortcuts.
This commit is contained in:
Chris Wren
2014-03-13 20:22:21 +00:00
committed by Android Git Automerger
@@ -461,7 +461,8 @@ public class LauncherBackupHelper implements BackupHelper {
int startRows = out.rows;
if (DEBUG) Log.d(TAG, "starting here: " + startRows);
String where = Favorites.ITEM_TYPE + "=" + Favorites.ITEM_TYPE_APPLICATION;
String where = Favorites.ITEM_TYPE + "=" + Favorites.ITEM_TYPE_APPLICATION + " OR " +
Favorites.ITEM_TYPE + "=" + Favorites.ITEM_TYPE_SHORTCUT;
Cursor cursor = cr.query(Favorites.CONTENT_URI, FAVORITE_PROJECTION,
where, null, null);
Set<String> currentIds = new HashSet<String>(cursor.getCount());