AI 143232: am: CL 143057 Don't NPE when editing a folder name.

Only happens when user changes orientation while editing, where getFolderById can return the wrong folder type for the given ID.
  Original author: jsharkey
  Merged from: //branches/cupcake/...

Automated import of CL 143232

src/com/android/launcher/LauncherModel.java

@@ -1243,7 +1243,7 @@ public class LauncherModel {
     FolderInfo getFolderById(Context context, long id) {
         final ContentResolver cr = context.getContentResolver();
         Cursor c = cr.query(LauncherSettings.Favorites.CONTENT_URI, null,
-                "_id=? and itemType=? or itemType=?",
+                "_id=? and (itemType=? or itemType=?)",
                 new String[] { String.valueOf(id),
                         String.valueOf(LauncherSettings.Favorites.ITEM_TYPE_USER_FOLDER),
                         String.valueOf(LauncherSettings.Favorites.ITEM_TYPE_LIVE_FOLDER) }, null);