Merge commit '6b93f61eea40f83e2bb35aa45fb0301b48225260' into eclair-mr2-plus-aosp
* commit '6b93f61eea40f83e2bb35aa45fb0301b48225260':
Don't allow "trash" to be synced (Fixes#2116463)
* When settings are changed, we loop through the sync error map,
clearing mailboxes in the changed account that are in an error
state.
* It's possible that there are mailboxes referenced in the map that
no longer exist. When trying to retrieve them from the provider,
null is returned, but we're not checking for this case, and an
NPE results.
* The fix is simply to check for null, and clear the error map for
the mailboxId that references a deleted mailbox
Change-Id: I8c1c847090026fa1c53b09bbe6b12d864bce4df1
Merge commit 'e2ea3e4f878a7005aeef77a7f7e2f0f2519cdc15' into eclair-mr2-plus-aosp
* commit 'e2ea3e4f878a7005aeef77a7f7e2f0f2519cdc15':
Import revised translations. DO NOT MERGE
Merge commit '743b143d0e06c7d3b8d8a28e9da3959649a2977c' into eclair-mr2
* commit '743b143d0e06c7d3b8d8a28e9da3959649a2977c':
Import revised translations. DO NOT MERGE
Merge commit '743b143d0e06c7d3b8d8a28e9da3959649a2977c' into eclair-plus-aosp
* commit '743b143d0e06c7d3b8d8a28e9da3959649a2977c':
Import revised translations. DO NOT MERGE
Merge commit '0a68553ae6b7e125587ed7c525afb7fc1d128ccc' into eclair-mr2-plus-aosp
* commit '0a68553ae6b7e125587ed7c525afb7fc1d128ccc':
Import revised translations. DO NOT MERGE
Merge commit 'bf67508d167339f303f2b9985516af3aa01aee51' into eclair-mr2
* commit 'bf67508d167339f303f2b9985516af3aa01aee51':
Import revised translations. DO NOT MERGE
Merge commit 'bf67508d167339f303f2b9985516af3aa01aee51' into eclair-plus-aosp
* commit 'bf67508d167339f303f2b9985516af3aa01aee51':
Import revised translations. DO NOT MERGE
Merge commit 'b12f46e04b7c12d34245b78a76be50e7741fc06d'
* commit 'b12f46e04b7c12d34245b78a76be50e7741fc06d':
Fix wording of security dialog per Roy West
Merge commit 'a08e88cd787f714f89d2ac016aa1272311a7b4c6' into eclair-mr2-plus-aosp
* commit 'a08e88cd787f714f89d2ac016aa1272311a7b4c6':
Fix wording of security dialog per Roy West
* Currently, we validate EAS accounts using a command that will
succeed even if we do not support required security policies.
* This causes a confusing "invalid username or password" error
when trying to sync with a validated account in the case that
there are, in fact, required policies
* The fix is to send a sync command after validating the user name
and password; a 403 error indicates the requirement for
security policies.
* When we see the 403 error, we put up a message that is appropriate
to the situation.
Change-Id: I74e132cb81f021cbb697cc9ee146405bf3ebc0ba
Merge commit '29935abb1cbb64ffa232daefeaae7ecc4541722b' into eclair-mr2-plus-aosp
* commit '29935abb1cbb64ffa232daefeaae7ecc4541722b':
Fix#2251837; better response when provisioning is required.
* Currently, we validate EAS accounts using a command that will
succeed even if we do not support required security policies.
* This causes a confusing "invalid username or password" error
when trying to sync with a validated account in the case that
there are, in fact, required policies
* The fix is to send a sync command after validating the user name
and password; a 403 error indicates the requirement for
security policies.
* When we see the 403 error, we put up a message that is appropriate
to the situation.
Change-Id: Ic40820253dca1f357297b2355ad987bc39d0775f
Merge commit '93517e94aea74f8ec5f8aed74b0b655ec5c0fd5c' into eclair-mr2-plus-aosp
* commit '93517e94aea74f8ec5f8aed74b0b655ec5c0fd5c':
Import revised translations. DO NOT MERGE
Merge commit '2dc97e3803b6270f90309455f9c06ad8b33c9d30'
* commit '2dc97e3803b6270f90309455f9c06ad8b33c9d30':
Allow sync data via the chunked transfer encoding DO NOT MERGE
Merge commit '2df576f14bf69c807304722f2dda61d86b0de18c' into eclair-mr2-plus-aosp
* commit '2df576f14bf69c807304722f2dda61d86b0de18c':
Allow sync data via the chunked transfer encoding DO NOT MERGE
Merge commit '151ebde5d1135ca7b50ffd97df14cda5d3282477' into eclair-mr2
* commit '151ebde5d1135ca7b50ffd97df14cda5d3282477':
Allow sync data via the chunked transfer encoding DO NOT MERGE
