am 0cd062eb: Merge "Fix acknowledgment of Exchange remote wipe" into froyo

Merge commit '0cd062ebd02fa9f3122ddc853cbc909be4c5d2db' into froyo-plus-aosp

* commit '0cd062ebd02fa9f3122ddc853cbc909be4c5d2db':
  Fix acknowledgment of Exchange remote wipe
This commit is contained in:
Marc Blank 2010-04-12 18:01:52 -07:00 committed by Android Git Automerger
commit 1c9a47a424

View File

@ -1269,13 +1269,13 @@ public class EasSyncService extends AbstractSyncService {
s.data(Tags.PROVISION_POLICY_KEY, tempKey); s.data(Tags.PROVISION_POLICY_KEY, tempKey);
s.data(Tags.PROVISION_STATUS, "1"); s.data(Tags.PROVISION_STATUS, "1");
s.end().end(); // PROVISION_POLICY, PROVISION_POLICIES
if (remoteWipe) { if (remoteWipe) {
s.start(Tags.PROVISION_REMOTE_WIPE); s.start(Tags.PROVISION_REMOTE_WIPE);
s.data(Tags.PROVISION_STATUS, "1"); s.data(Tags.PROVISION_STATUS, "1");
s.end(); s.end();
} }
s.end(); // PROVISION_POLICY s.end().done(); // PROVISION_PROVISION
s.end().end().done(); // PROVISION_POLICIES, PROVISION_PROVISION
HttpResponse resp = sendHttpClientPost("Provision", s.toByteArray()); HttpResponse resp = sendHttpClientPost("Provision", s.toByteArray());
int code = resp.getStatusLine().getStatusCode(); int code = resp.getStatusLine().getStatusCode();
if (code == HttpStatus.SC_OK) { if (code == HttpStatus.SC_OK) {