am 50f0cba9: Merge "Sync disabled tip" into jb-ub-mail-ur10

* commit '50f0cba92ce2c2f45600cfd0e5184df84d3ab370':
  Sync disabled tip
This commit is contained in:
Alice Yang 2013-08-11 22:43:29 -07:00 committed by Android Git Automerger
commit 20fb031633

View File

@ -2638,6 +2638,9 @@ public class EmailProvider extends ContentProvider {
values.put(UIProvider.AccountColumns.SettingsColumns.MOVE_TO_INBOX, values.put(UIProvider.AccountColumns.SettingsColumns.MOVE_TO_INBOX,
uiUriString("uifolder", inboxMailboxId)); uiUriString("uifolder", inboxMailboxId));
} }
if (projectionColumns.contains(UIProvider.AccountColumns.SYNC_AUTHORITY)) {
values.put(UIProvider.AccountColumns.SYNC_AUTHORITY, EmailContent.AUTHORITY);
}
final StringBuilder sb = genSelect(getAccountListMap(getContext()), uiProjection, values); final StringBuilder sb = genSelect(getAccountListMap(getContext()), uiProjection, values);
sb.append(" FROM " + Account.TABLE_NAME + " WHERE " + AccountColumns.ID + "=?"); sb.append(" FROM " + Account.TABLE_NAME + " WHERE " + AccountColumns.ID + "=?");