am 9b83870a: Merge change I3b505448 into eclair-mr2

Merge commit '9b83870a091084a3575a354539eaf98c516ccf2c' into eclair-mr2-plus-aosp

* commit '9b83870a091084a3575a354539eaf98c516ccf2c':
  Use correct EAS protocol version in Outbox (fixes #2319892)
This commit is contained in:
Marc Blank 2009-12-11 09:32:30 -08:00 committed by Android Git Automerger
commit c6a0605f61

View File

@ -1090,6 +1090,10 @@ public class EasSyncService extends AbstractSyncService {
mHostAddress = ha.mAddress;
mUserName = ha.mLogin;
mPassword = ha.mPassword;
// Set up our protocol version
mProtocolVersion = mAccount.mProtocolVersion;
mProtocolVersionDouble = Double.parseDouble(mProtocolVersion);
return true;
}
@ -1114,8 +1118,6 @@ public class EasSyncService extends AbstractSyncService {
runAccountMailbox();
} else {
AbstractSyncAdapter target;
mProtocolVersion = mAccount.mProtocolVersion;
mProtocolVersionDouble = Double.parseDouble(mProtocolVersion);
if (mMailbox.mType == Mailbox.TYPE_CONTACTS) {
target = new ContactsSyncAdapter(mMailbox, this);
} else {