diff options
| author | James Lemieux <jplemieux@google.com> | 2014-09-30 23:11:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-30 23:11:37 +0000 |
| commit | 69ba565b62874d4957c28749494bef173490b0c1 (patch) | |
| tree | fcc004a171906dc08de237e7796edd74ebbc7415 /provider_src/com/android/email/provider/EmailProvider.java | |
| parent | 40236a89316ab2151a8c93de0e286c2f1a9a8d37 (diff) | |
| parent | aa2ca51477039788c4e69db3579a51baffbb9079 (diff) | |
| download | android_packages_apps_Email-69ba565b62874d4957c28749494bef173490b0c1.tar.gz android_packages_apps_Email-69ba565b62874d4957c28749494bef173490b0c1.tar.bz2 android_packages_apps_Email-69ba565b62874d4957c28749494bef173490b0c1.zip | |
Merge "Combined view should also display client-side sanitized HTML" into ub-gmail-ur14-dev
Diffstat (limited to 'provider_src/com/android/email/provider/EmailProvider.java')
| -rw-r--r-- | provider_src/com/android/email/provider/EmailProvider.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/provider_src/com/android/email/provider/EmailProvider.java b/provider_src/com/android/email/provider/EmailProvider.java index e4d052081..b643c528a 100644 --- a/provider_src/com/android/email/provider/EmailProvider.java +++ b/provider_src/com/android/email/provider/EmailProvider.java @@ -3654,7 +3654,9 @@ public class EmailProvider extends ContentProvider } if (colPosMap.containsKey(UIProvider.AccountColumns.CAPABILITIES)) { values[colPosMap.get(UIProvider.AccountColumns.CAPABILITIES)] = - AccountCapabilities.UNDO | AccountCapabilities.VIRTUAL_ACCOUNT; + AccountCapabilities.UNDO | + AccountCapabilities.VIRTUAL_ACCOUNT | + AccountCapabilities.CLIENT_SANITIZED_HTML; } if (colPosMap.containsKey(UIProvider.AccountColumns.FOLDER_LIST_URI)) { values[colPosMap.get(UIProvider.AccountColumns.FOLDER_LIST_URI)] = |