Merge commit '42e18b2edbeca92ff0f2de1525481336daee61b0'
* commit '42e18b2edbeca92ff0f2de1525481336daee61b0':
Handle the case of no body being present (happens in unit tests)
Merge commit '8831da7a240898b5e35b0f35f14f1de93fb780f1'
* commit '8831da7a240898b5e35b0f35f14f1de93fb780f1':
change to use the new CALLER_IS_SYNCADAPTER flag
Merge commit '3463b401466628f58118d74f0a1a7ee51edb27b5'
* commit '3463b401466628f58118d74f0a1a7ee51edb27b5':
Fix bug in which EAS mail won't ever get sent (#2118279)
Merge commit '54ef94999bc8460e6548ee92e9e8d2b3b7be2160'
* commit '54ef94999bc8460e6548ee92e9e8d2b3b7be2160':
Make sure SyncManager keeps running in various edge cases
Merge commit 'da57cf18f75d58e66388a1bc39a9a9383bd48fb4'
* commit 'da57cf18f75d58e66388a1bc39a9a9383bd48fb4':
Improve the checkMailbox loop query to get only the appropriate boxes
Merge commit '0c4dc85190028f389f0dcbc3dbed0b344d20a313' into eclair-plus-aosp
* commit '0c4dc85190028f389f0dcbc3dbed0b344d20a313':
Harden against crashes caused by account deletes
The basic failure mode is to delete an account while it is being
synced or some other background activity. The fixes in this CL will
harden against this, but it will not be a perfect solution; That
will require shutting down all sync, which is difficult in the current
too-many-threads implementation.
Primary bug# 2112564
Merge commit '09982cf4e29afe44acb63acfc85546ab5ea6e641'
* commit '09982cf4e29afe44acb63acfc85546ab5ea6e641':
Don't wait longer than 10s for ping boxes to be ready
Merge commit '5024030e89812c77ae835accd7c2a652a0af7a88'
* commit '5024030e89812c77ae835accd7c2a652a0af7a88':
Don't sync if the "Sync Contacts" checkbox isn't set
Merge commit 'fc7dfddf192f4875cbfcf6cd49829ccdfee1d3af' into eclair-plus-aosp
* commit 'fc7dfddf192f4875cbfcf6cd49829ccdfee1d3af':
Support StructuredName.DISPLAY_NAME for Exchange contacts
Merge commit '2aa3e92fe3b4dde20f388ccf2a9502d12ad6969c' into eclair-plus-aosp
* commit '2aa3e92fe3b4dde20f388ccf2a9502d12ad6969c':
show message list selection
Merge commit 'da8836a76cd8a6eaa7e3693eeacc6393870b2066' into eclair-plus-aosp
* commit 'da8836a76cd8a6eaa7e3693eeacc6393870b2066':
Give warnings if dupe account created:
* Check for existing accounts with matching servername + username
* Show a dialog and block account creation
* Triggers in three cases:
* After input of an auto-setup account (e.g. Gmail or AOL)
* After input of manual setup (incoming) parameters
* After changing incoming parameters of *any* existing account
* Made some notes in EmailContent regarding fields in HostAuth that we
are not actually using.
* Added HostAuth unit tests
Primarily fixes bug # 1964449
Bonus fix for bug # 1594408
Change-Id: I49310faf6654280582e0ab3d3e40f2701bfcd21d
Merge commit '2d5691cac1874eb3491353ab608a84c2a75e2b62' into eclair-plus-aosp
* commit '2d5691cac1874eb3491353ab608a84c2a75e2b62':
Support bcc in Exchange (Fixes#2117849)
Merge commit 'ffc681a4da85c82c80d819ab8afb4442577c52a0' into eclair-plus-aosp
* commit 'ffc681a4da85c82c80d819ab8afb4442577c52a0':
Handle the case of no body being present (happens in unit tests)
Merge commit '3bef61019605176b3397b5ae659205ac324689ed' into eclair-plus-aosp
* commit '3bef61019605176b3397b5ae659205ac324689ed':
change to use the new CALLER_IS_SYNCADAPTER flag
Merge commit '047d1ae60af1a875eb54723b1f18722c2f67852c'
* commit '047d1ae60af1a875eb54723b1f18722c2f67852c':
Fix leaked intent receiver by using onStartCommand in SyncManager
Merge commit 'bb1b993808f295dc0d6c850a7d1b08b6f8846a34'
* commit 'bb1b993808f295dc0d6c850a7d1b08b6f8846a34':
Make exchange contact category names visible; also their members
