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
Merge commit '394be87968c4716653251351b24c85f3f01d8799'
* commit '394be87968c4716653251351b24c85f3f01d8799':
AI 148488: 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 148488
Merge commit '1eba4b57f3846c8605654254cd6be97d1dc7d318'
* commit '1eba4b57f3846c8605654254cd6be97d1dc7d318':
AI 148485: Clean up the scrollview layout so the button bar is always on the
bottom of the screen.
Also removed an extra ':' in a string on the screen (none of the other
label strings have ':').
BUG=1740626
Automated import of CL 148485
Merge commit '3d267690a3295e2d1e6df8fb77cb92625f010480'
* commit '3d267690a3295e2d1e6df8fb77cb92625f010480':
AI 148457: Allow exchange accounts to be set up without an empty domain
Merge commit '6aaffded0bcbcf3cb02dabf35eb7fdcace420fe2'
* commit '6aaffded0bcbcf3cb02dabf35eb7fdcace420fe2':
AI 148382: Check cursors in LocalStore so we avoid errors when the folder itself
Merge commit '8cbbcb14c2d49c6d7eb9fb2d141ffd7f3d2889a2'
* commit '8cbbcb14c2d49c6d7eb9fb2d141ffd7f3d2889a2':
AI 148378: Allow store to create BinaryTempFileBody from a preexisting file
Mihai Preda