Merge commit 'a4258ed4877a0d559c7f600be9a326135aed4440' into eclair-plus-aosp
* commit 'a4258ed4877a0d559c7f600be9a326135aed4440':
Fix sendPing to set proper ping timeouts
* We were setting the timeout and heartbeat to the same time,
which could cause mistaken timeouts
* Set timeout ten seconds after the heartbeat for now, and set
an alarm a few seconds after that
Change-Id: Ic2f7b44c9626ebbdd7a8821f53f7aaf6169f62c3
Merge commit '62cf0a3336875752b1a180f55ed19f1f6fb3ee68' into eclair-plus-aosp
* commit '62cf0a3336875752b1a180f55ed19f1f6fb3ee68':
Remove a bit of logging in ContactsSyncAdapter
Merge commit '0d4681cd6606015fd242f148ec213a3256a81ec7' into eclair-plus-aosp
* commit '0d4681cd6606015fd242f148ec213a3256a81ec7':
Catch possible NPE in IMAP sync.
I don't know the root cause of the null pointer (possibly a broken
connection earlier in the sync) but we shouldn't be crashing here.
Fixes http://b/2135743
Merge commit 'aff9926d84a2ae3b669d8acb1cb2f80e3b37b33f' into eclair-plus-aosp
* commit 'aff9926d84a2ae3b669d8acb1cb2f80e3b37b33f':
Reduce the sync window from 20 items to 5 (partial fix#2149029)
* This change trades off network time / overhead with time keeping
ContactsProvider2 busy
* The net effect will probably be to reduce some UI slowdowns while
syncing Exchange contacts, while increasing the time it takes to
sync those contacts
Change-Id: I56e2358698aa4c901cda4559f7a8f9117681f627
Merge commit 'deffba584e9a66ca3dca3c897728fd1b8c66b368' into eclair-plus-aosp
* commit 'deffba584e9a66ca3dca3c897728fd1b8c66b368':
Stop forcing email logging for all users
Merge commit '832e4a02a670b565a377938b3138e73421d59388' into eclair-plus-aosp
* commit '832e4a02a670b565a377938b3138e73421d59388':
Add hostChanged service call; use it from UI (fixes#2148572)
* After a HostAuth has been changed for an EAS account, the SyncManager needs
to be alerted so that it can take appropriate action
* Added hostChanged service call
* Send service call from AccountSetupExchange after a HostAuth is edited
* Stop running syncs and clear error states in hostChanged
Change-Id: I2311e2d00be81ea7829f5f4e38b2377f18c63f30
Merge commit '695fdb1cbbe2da817b5b70a00568a0a905e139f0' into eclair-plus-aosp
* commit '695fdb1cbbe2da817b5b70a00568a0a905e139f0':
MessageView: check for null mMessageContentView on access.
Merge commit '02fcd3b4e7ad526d1be1f7a62d7dfbefc50727ba' into eclair-plus-aosp
* commit '02fcd3b4e7ad526d1be1f7a62d7dfbefc50727ba':
MessageCompose: fix loading the quoted text after a configuration change.
Merge commit '7768ce276ede4ee979df28ee514ddca79bdb90ab' into eclair-plus-aosp
* commit '7768ce276ede4ee979df28ee514ddca79bdb90ab':
MessageCompose: delete the attachments that are removed in the UI.
Bug 2136283.
Because of the mSourceMessageProcessed guard, the loading after a config change
was done exclusively by the default view hierarchy save/restore.
But this default view restore does not handle WebView content,
thus affecting the quoted text.
Merge commit 'ce3bb9abccf02f047b1d11083584d5ab04ad6341' into eclair-plus-aosp
* commit 'ce3bb9abccf02f047b1d11083584d5ab04ad6341':
Per spec, allow all attachments to be added via INTENT.
Merge commit '4c8f06283ff1ecdb197d4e446588928333e77a81' into eclair-plus-aosp
* commit '4c8f06283ff1ecdb197d4e446588928333e77a81':
Don't send local changes of Drafts/Outbox to server (fixes#2149122)
Merge commit 'e6a8d98e9e038f17d528d45ce2779c65fe46630b' into eclair-plus-aosp
* commit 'e6a8d98e9e038f17d528d45ce2779c65fe46630b':
Make checkbox and star more easily selected
Merge commit '386153695bf3207ff160dc33a1112f7ea6dbd721' into eclair-plus-aosp
* commit '386153695bf3207ff160dc33a1112f7ea6dbd721':
Watch for null results when updating internaldate.
Fixes bug # 2148971
Note, this condition happens when we APPEND a message to the server
but then we turn around and query for it, and the server reports that
it's not there:
>>> 7 APPEND "Sent" {490}
<<< #null# [Ready, for, argument]
<<< #null# [194, EXISTS]
<<< #7# [OK, [APPENDUID, 1233339552, 1191], APPEND, completed]
>>> 8 UID SEARCH (HEADER MESSAGE-ID \
<pwyc0i5yviwvu5nwio2lwdo5.1254073239445@email.android.com>)
<<< #null# [SEARCH]
<<< #8# [OK, UID, SEARCH, completed]
>>> 9 UID SEARCH UID NULL
<<< #9# [BAD, UID, SEARCH, error;, bogus, or, incorrect, syntax, \
of, search, critera]
I don't know why the Yahoo! server did this, but now we'll at least not
crash if they do it again.
Merge commit 'e4405a714ddbdc659336edbb530bf77d3b212a7f' into eclair-plus-aosp
* commit 'e4405a714ddbdc659336edbb530bf77d3b212a7f':
Messages upsynced to "sent" should be marked as "read".
