commit 41500ffe9d3ed7dbaa8e96fe8e825c7ed3d69140
author Yu Ping Hu <yph@google.com> Tue Oct 08 17:53:34 2013 -0700
committer Yu Ping Hu <yph@google.com> Tue Oct 08 18:25:41 2013 -0700
tree 68da1ced4689e2e5856ee2de8ee6f786c59f61e7
parent 77b653fa1b5baabddb76802f0333c78f80c29ace

Do not assume that Exchange sanitizes its HTML.

Bug: 11139503
Change-Id: Ifbc2f81298bcdde3f2e934588b1e8edb3bfc8a2c

src/com/android/exchange/ExchangeService.java

diff --git a/src/com/android/exchange/ExchangeService.java b/src/com/android/exchange/ExchangeService.java
index 7ebc8ff..f6ba28c 100644
--- a/src/com/android/exchange/ExchangeService.java
+++ b/src/com/android/exchange/ExchangeService.java
@@ -93,14 +93,12 @@
             AccountCapabilities.SYNCABLE_FOLDERS |
             AccountCapabilities.SERVER_SEARCH |
             AccountCapabilities.FOLDER_SERVER_SEARCH |
-            AccountCapabilities.SANITIZED_HTML |
             AccountCapabilities.SMART_REPLY |
             AccountCapabilities.SERVER_SEARCH |
             AccountCapabilities.UNDO;
 
     private static final int EAS_2_CAPABILITIES =
             AccountCapabilities.SYNCABLE_FOLDERS |
-            AccountCapabilities.SANITIZED_HTML |
             AccountCapabilities.SMART_REPLY |
             AccountCapabilities.UNDO;
 

src/com/android/exchange/service/EmailSyncAdapterService.java

diff --git a/src/com/android/exchange/service/EmailSyncAdapterService.java b/src/com/android/exchange/service/EmailSyncAdapterService.java
index 2261c0f..a1412db 100644
--- a/src/com/android/exchange/service/EmailSyncAdapterService.java
+++ b/src/com/android/exchange/service/EmailSyncAdapterService.java
@@ -418,13 +418,11 @@
                 return AccountCapabilities.SYNCABLE_FOLDERS |
                         AccountCapabilities.SERVER_SEARCH |
                         AccountCapabilities.FOLDER_SERVER_SEARCH |
-                        AccountCapabilities.SANITIZED_HTML |
                         AccountCapabilities.SMART_REPLY |
                         AccountCapabilities.UNDO |
                         AccountCapabilities.DISCARD_CONVERSATION_DRAFTS;
             } else {
                 return AccountCapabilities.SYNCABLE_FOLDERS |
-                        AccountCapabilities.SANITIZED_HTML |
                         AccountCapabilities.SMART_REPLY |
                         AccountCapabilities.UNDO |
                         AccountCapabilities.DISCARD_CONVERSATION_DRAFTS;