am 41e3f37b: Merge "b/13659097. Disable EAS Policy max attachment size from EmailProvider." into ub-mail-algol

* commit '41e3f37b501ea787c6569f4ac22a11d269dd6557':
  b/13659097. Disable EAS Policy max attachment size from EmailProvider.
This commit is contained in:
Anthony Lee 2014-03-27 18:46:13 +00:00 committed by Android Git Automerger
commit 30dc25c390
1 changed files with 0 additions and 2 deletions

View File

@ -2518,8 +2518,6 @@ public class EmailProvider extends ContentProvider {
.add(UIProvider.AccountColumns.SettingsColumns.CONFIRM_ARCHIVE, "0")
.add(UIProvider.AccountColumns.SettingsColumns.CONVERSATION_VIEW_MODE,
Integer.toString(UIProvider.ConversationViewMode.UNDEFINED))
.add(UIProvider.AccountColumns.SettingsColumns.MAX_ATTACHMENT_SIZE,
AccountColumns.MAX_ATTACHMENT_SIZE)
.add(UIProvider.AccountColumns.SettingsColumns.VEILED_ADDRESS_PATTERN, null);
final String feedbackUri = context.getString(R.string.email_feedback_uri);