Merge change I3b505448 into eclair-mr2

* changes:
  Use correct EAS protocol version in Outbox (fixes #2319892)
This commit is contained in:
Android (Google) Code Review 2009-12-11 09:28:36 -08:00
commit 9b83870a09

View File

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