Merge commit '7330fe4953c39741376bdd8cb3e5c2c03068b0aa'
* commit '7330fe4953c39741376bdd8cb3e5c2c03068b0aa':
AI 149573: Display To: instead of From: in Drafts folder && Display unread message count for inbox, total message count everywhere else.
Merge commit '438275b283224a9f830e42d4e645981d1f73589b'
* commit '438275b283224a9f830e42d4e645981d1f73589b':
AI 149564: Escape special characters such as '<>&' in text/plain for display in WebView.
Integrate CL 144586,145919 from imode.
Remove the Emoji escaping/workaround for WebView.
Also integrate MimeHeader.java from CL 143064 from imode.
BUG=1785319,1860250
Automated import of CL 149564
* Editing existing accounts
* Two placeholder accounts are written
What breaks (in approx order of planned fixes)
* Some details of account editing
* New account creation,
* Viewing mailboxes & messages
* Mail sync using accounts
* Import of existing accounts
1. Call notifyChange() after all API calls.
2. Make Account & HostAuth parcelable
3. Temporary APIs to create "store URI" strings for the existing mail code
Merge commit 'fbde900c37ae76ec3c6181b3328d4ddf7c46cc7e'
* commit 'fbde900c37ae76ec3c6181b3328d4ddf7c46cc7e':
AI 149442: Integrate CL#140625 (Fix attachment uri and content uri confusion) from imode to donut.
AI 149328: Add extended header support to MimeMessage, MimeBodyPart, and LocalStore.
This extension is necessary to support some vendor specific
extended header, such as X-NoRtn-Addr of i-mode.net mail.
This change will update LocalStore database version to 24.
And it should be consistent between donutburger Email and DocomoEmail.
BUG=1741969
Automated import of CL 149328
Merge commit 'f50c7fb0842c403edc47ea7258af06e7fd1f262c'
* commit 'f50c7fb0842c403edc47ea7258af06e7fd1f262c':
Fix the java.lang.StringIndexOutOfBoundsException that occurs when an SMTP server closes the connection early or returns an empty line.
* changes:
Fix the java.lang.StringIndexOutOfBoundsException that occurs when an SMTP server closes the connection early or returns an empty line. Fix the same error in the Pop3 UIDL parser.
Merge commit '6c9e21254c65a16a9847f7dd5f4c05b61f6e6dc0'
* commit '6c9e21254c65a16a9847f7dd5f4c05b61f6e6dc0':
Remove the msgId string-stealing-hacks because we will do new translations for donut.
Merge commit 'b5343c4cc535a885d9913811a4d6616dd0d24e13'
* commit 'b5343c4cc535a885d9913811a4d6616dd0d24e13':
AI 149203: Manual merge CL 149118: "Make URL which is in the head of body text be
*** Reason for rollback ***
Rollback global lock because bug (now fixed) was not caused by
threading/concurrency.
*** Original change description ***
Evidence from failures, and inspection of source, leads me to believe
that SharedPreferences has some non-thread-safe paths. As a quick,
brute-force workaround, I'm putting a global lock around our use of it.
This is a bit inefficient, but cases of multiple threads writing to it
should be very rare.
Note, we don't have an explicit test for this (I will think about
finding a way to write one), but the evidence of this failure is that
after some amount of activity in the Email app, we see corrup
... description truncated by g4 rollback ...
Automated import of CL 149140
*** Reason for rollback ***
Problem found (bug in ICU encoder/decoder) so instrumentation no
longer required here.
*** Original change description ***
Heavily-instrumented Account.java that's looking for the precise moment
when an Account string gets corrupted. Looks for bad base64 strings
and bad store Uri's. Logs the error, and (optionally/disabled) throws
an exception (good for debugging).
BUG=1822859
Automated import of CL 149088
Merge commit '6807fd1d478b48843c5d0698dc59e33bf3f1d3b0'
* commit '6807fd1d478b48843c5d0698dc59e33bf3f1d3b0':
AI 149059: Manually merge CL 148988 to fix "Not to revert SEEN flag if POP, and
Merge commit '51801db8e9e07865c87296bfccea7964e4c0ad99'
* commit '51801db8e9e07865c87296bfccea7964e4c0ad99':
AI 149020: Manually merge CLs 148814, 148818 which fix IMAP response parsing to be
