Merge "Bring log change back in" into jb-ub-mail-ur10

19 files changed, 71 insertions, 61 deletions

diff --git a/src/com/android/exchange/adapter/CalendarSyncParser.java b/src/com/android/exchange/adapter/CalendarSyncParser.java
index 0659024d..f059c097 100644
--- a/src/com/android/exchange/adapter/CalendarSyncParser.java
+++ b/src/com/android/exchange/adapter/CalendarSyncParser.java
@@ -566,7 +566,7 @@ public class CalendarSyncParser extends AbstractSyncParser {
             }
             // Tell UI that we don't have any attendees
             cv.put(Events.HAS_ATTENDEE_DATA, "0");
-            LogUtils.i(TAG, "Maximum number of attendees exceeded; redacting");
+            LogUtils.d(TAG, "Maximum number of attendees exceeded; redacting");
         } else if (numAttendees > 0) {
             StringBuilder sb = new StringBuilder();
             for (ContentValues attendee: attendeeValues) {
@@ -882,7 +882,7 @@ public class CalendarSyncParser extends AbstractSyncParser {
             ops.newReminder(reminderMins, exceptionStart);
         }
         if (attendeesRedacted) {
-            LogUtils.i(TAG, "Attendees redacted in this exception");
+            LogUtils.d(TAG, "Attendees redacted in this exception");
         }
     }
 
diff --git a/src/com/android/exchange/adapter/FolderSyncParser.java b/src/com/android/exchange/adapter/FolderSyncParser.java
index 20ce2791..9226ff2b 100644
--- a/src/com/android/exchange/adapter/FolderSyncParser.java
+++ b/src/com/android/exchange/adapter/FolderSyncParser.java
@@ -289,7 +289,7 @@ public class FolderSyncParser extends AbstractSyncParser {
                     final Cursor c = getServerIdCursor(serverId);
                     try {
                         if (c.moveToFirst()) {
-                            LogUtils.i(TAG, "Deleting %s", serverId);
+                            LogUtils.d(TAG, "Deleting %s", serverId);
                             final long mailboxId = c.getLong(MAILBOX_ID_COLUMNS_ID);
                             mOperations.add(ContentProviderOperation.newDelete(
                                     ContentUris.withAppendedId(Mailbox.CONTENT_URI,
@@ -514,7 +514,7 @@ public class FolderSyncParser extends AbstractSyncParser {
             try {
                 // If we find the mailbox (using serverId), make the change
                 if (c.moveToFirst()) {
-                    LogUtils.i(TAG, "Updating %s", serverId);
+                    LogUtils.d(TAG, "Updating %s", serverId);
                     final ContentValues cv = new ContentValues();
                     // Store the new parent key.
                     cv.put(Mailbox.PARENT_SERVER_ID, parentId);
diff --git a/src/com/android/exchange/adapter/MeetingResponseParser.java b/src/com/android/exchange/adapter/MeetingResponseParser.java
index 3849acda..7fc238c7 100644
--- a/src/com/android/exchange/adapter/MeetingResponseParser.java
+++ b/src/com/android/exchange/adapter/MeetingResponseParser.java
@@ -36,10 +36,10 @@ public class MeetingResponseParser extends Parser {
             if (tag == Tags.MREQ_STATUS) {
                 int status = getValueInt();
                 if (status != 1) {
-                    LogUtils.i(TAG, "Error in meeting response: %d", status);
+                    LogUtils.w(TAG, "Error in meeting response: %d", status);
                 }
             } else if (tag == Tags.MREQ_CAL_ID) {
-                LogUtils.i(TAG, "Meeting response calender id: %s", getValue());
+                LogUtils.d(TAG, "Meeting response calender id: %s", getValue());
             } else {
                 skipTag();
             }
diff --git a/src/com/android/exchange/adapter/MoveItemsParser.java b/src/com/android/exchange/adapter/MoveItemsParser.java
index f593bcf8..aa5d787e 100644
--- a/src/com/android/exchange/adapter/MoveItemsParser.java
+++ b/src/com/android/exchange/adapter/MoveItemsParser.java
@@ -88,14 +88,14 @@ public class MoveItemsParser extends Parser {
                 }
                 if (status != STATUS_SUCCESS) {
                     // There's not much to be done if this fails
-                    LogUtils.i(TAG, "Error in MoveItems: %d", status);
+                    LogUtils.w(TAG, "Error in MoveItems: %d", status);
                 }
             } else if (tag == Tags.MOVE_DSTMSGID) {
                 mNewServerId = getValue();
-                LogUtils.i(TAG, "Moved message id is now: %s", mNewServerId);
+                LogUtils.d(TAG, "Moved message id is now: %s", mNewServerId);
             } else if (tag == Tags.MOVE_SRCMSGID) {
                 mSourceServerId = getValue();
-                LogUtils.i(TAG, "Source message id is: %s", mNewServerId);
+                LogUtils.d(TAG, "Source message id is: %s", mNewServerId);
             } else {
                 skipTag();
             }
diff --git a/src/com/android/exchange/adapter/PingParser.java b/src/com/android/exchange/adapter/PingParser.java
index 41348843..58d252ac 100644
--- a/src/com/android/exchange/adapter/PingParser.java
+++ b/src/com/android/exchange/adapter/PingParser.java
@@ -203,7 +203,7 @@ public class PingParser extends Parser {
                 }
                 parsePingFolders();
                 final int count = mSyncList.size();
-                LogUtils.i(TAG, "Folders has %d elements", count);
+                LogUtils.d(TAG, "Folders has %d elements", count);
                 if (count == 0) {
                     throw new IOException("Folders was empty");
                 }
diff --git a/src/com/android/exchange/adapter/ProvisionParser.java b/src/com/android/exchange/adapter/ProvisionParser.java
index 08f0ed7d..d7be0d8d 100644
--- a/src/com/android/exchange/adapter/ProvisionParser.java
+++ b/src/com/android/exchange/adapter/ProvisionParser.java
@@ -535,13 +535,13 @@ public class ProvisionParser extends Parser {
             switch (tag) {
                 case Tags.PROVISION_POLICY_TYPE:
                     policyType = getValue();
-                    LogUtils.i(TAG, "Policy type: %s", policyType);
+                    LogUtils.d(TAG, "Policy type: %s", policyType);
                     break;
                 case Tags.PROVISION_POLICY_KEY:
                     mSecuritySyncKey = getValue();
                     break;
                 case Tags.PROVISION_STATUS:
-                    LogUtils.i(TAG, "Policy status: %s", getValue());
+                    LogUtils.d(TAG, "Policy status: %s", getValue());
                     break;
                 case Tags.PROVISION_DATA:
                     if (policyType.equalsIgnoreCase(EasProvision.EAS_2_POLICY_TYPE)) {
@@ -571,7 +571,7 @@ public class ProvisionParser extends Parser {
     private void parseDeviceInformation() throws IOException {
         while (nextTag(Tags.SETTINGS_DEVICE_INFORMATION) != END) {
             if (tag == Tags.SETTINGS_STATUS) {
-                LogUtils.i(TAG, "DeviceInformation status: %s", getValue());
+                LogUtils.d(TAG, "DeviceInformation status: %s", getValue());
             } else {
                 skipTag();
             }
@@ -588,7 +588,7 @@ public class ProvisionParser extends Parser {
             switch (tag) {
                 case Tags.PROVISION_STATUS:
                     int status = getValueInt();
-                    LogUtils.i(TAG, "Provision status: %d", status);
+                    LogUtils.d(TAG, "Provision status: %d", status);
                     res = (status == 1);
                     break;
                 case Tags.SETTINGS_DEVICE_INFORMATION:
diff --git a/src/com/android/exchange/adapter/SettingsParser.java b/src/com/android/exchange/adapter/SettingsParser.java
index 1f177dca..5551db63 100644
--- a/src/com/android/exchange/adapter/SettingsParser.java
+++ b/src/com/android/exchange/adapter/SettingsParser.java
@@ -45,7 +45,7 @@ public class SettingsParser extends Parser {
         while (nextTag(START_DOCUMENT) != END_DOCUMENT) {
             if (tag == Tags.SETTINGS_STATUS) {
                 int status = getValueInt();
-                LogUtils.i(TAG, "Settings status = %d", status);
+                LogUtils.d(TAG, "Settings status = %d", status);
                 if (status == 1) {
                     res = true;
                 } else {
@@ -74,7 +74,7 @@ public class SettingsParser extends Parser {
     public void parseSet() throws IOException {
         while (nextTag(Tags.SETTINGS_SET) != END) {
             if (tag == Tags.SETTINGS_STATUS) {
-                LogUtils.i(TAG, "Set status = %d", getValueInt());
+                LogUtils.d(TAG, "Set status = %d", getValueInt());
             } else {
                 skipTag();
             }
diff --git a/src/com/android/exchange/eas/EasConnectionCache.java b/src/com/android/exchange/eas/EasConnectionCache.java
index 175f3ca7..3b1f1405 100644
--- a/src/com/android/exchange/eas/EasConnectionCache.java
+++ b/src/com/android/exchange/eas/EasConnectionCache.java
@@ -78,7 +78,7 @@ public class EasConnectionCache {
      */
     private EmailClientConnectionManager createConnectionManager(final Context context,
             final HostAuth hostAuth) {
-        LogUtils.i(Eas.LOG_TAG, "Creating connection for HostAuth %d", hostAuth.mId);
+        LogUtils.d(Eas.LOG_TAG, "Creating connection for HostAuth %d", hostAuth.mId);
         final HttpParams params = new BasicHttpParams();
         params.setIntParameter(ConnManagerPNames.MAX_TOTAL_CONNECTIONS, 25);
         params.setParameter(ConnManagerPNames.MAX_CONNECTIONS_PER_ROUTE, sConnPerRoute);
@@ -94,7 +94,7 @@ public class EasConnectionCache {
      */
     private synchronized EmailClientConnectionManager getCachedConnectionManager(
             final Context context, final HostAuth hostAuth) {
-        LogUtils.i(Eas.LOG_TAG, "Reusing cached connection for HostAuth %d", hostAuth.mId);
+        LogUtils.d(Eas.LOG_TAG, "Reusing cached connection for HostAuth %d", hostAuth.mId);
         EmailClientConnectionManager connectionManager = mConnectionMap.get(hostAuth.mId);
         if (connectionManager == null) {
             connectionManager = createConnectionManager(context, hostAuth);
@@ -130,7 +130,7 @@ public class EasConnectionCache {
      * @param hostAuth The {@link HostAuth} whose connection manager should be deleted.
      */
     public synchronized void uncacheConnectionManager(final HostAuth hostAuth) {
-        LogUtils.i(Eas.LOG_TAG, "Uncaching connection for HostAuth %d", hostAuth.mId);
+        LogUtils.d(Eas.LOG_TAG, "Uncaching connection for HostAuth %d", hostAuth.mId);
         mConnectionMap.remove(hostAuth.mId);
     }
 }
diff --git a/src/com/android/exchange/eas/EasFolderSync.java b/src/com/android/exchange/eas/EasFolderSync.java
index 63ea753f..5f81a911 100644
--- a/src/com/android/exchange/eas/EasFolderSync.java
+++ b/src/com/android/exchange/eas/EasFolderSync.java
@@ -101,7 +101,7 @@ public class EasFolderSync extends EasOperation {
         if (mStatusOnly) {
             return RESULT_WRONG_OPERATION;
         }
-        LogUtils.i(LOG_TAG, "Performing sync for account %d", mAccount.mId);
+        LogUtils.d(LOG_TAG, "Performing sync for account %d", mAccount.mId);
         return performOperation(syncResult);
     }
 
@@ -115,7 +115,7 @@ public class EasFolderSync extends EasOperation {
             writeResultCode(bundle, RESULT_OTHER_FAILURE);
             return bundle;
         }
-        LogUtils.i(LOG_TAG, "Performing validation");
+        LogUtils.d(LOG_TAG, "Performing validation");
 
         if (!registerClientCert()) {
             bundle.putInt(EmailServiceProxy.VALIDATE_BUNDLE_RESULT_CODE,
diff --git a/src/com/android/exchange/eas/EasOperation.java b/src/com/android/exchange/eas/EasOperation.java
index 87c871f0..273d9fbd 100644
--- a/src/com/android/exchange/eas/EasOperation.java
+++ b/src/com/android/exchange/eas/EasOperation.java
@@ -578,7 +578,7 @@ public abstract class EasOperation {
         final Bundle extras = new Bundle(1);
         extras.putBoolean(Mailbox.SYNC_EXTRA_NOOP, true);
         ContentResolver.requestSync(amAccount, authority, extras);
-        LogUtils.i(LOG_TAG, "requestSync EasOperation requestNoOpSync %s, %s",
+        LogUtils.d(LOG_TAG, "requestSync EasOperation requestNoOpSync %s, %s",
                 amAccount.toString(), extras.toString());
     }
 }
diff --git a/src/com/android/exchange/eas/EasOptions.java b/src/com/android/exchange/eas/EasOptions.java
index c6c4d03a..32d2c757 100644
--- a/src/com/android/exchange/eas/EasOptions.java
+++ b/src/com/android/exchange/eas/EasOptions.java
@@ -114,7 +114,7 @@ public class EasOptions extends EasOperation {
         // The string is a comma separated list of EAS versions in ascending order
         // e.g. 1.0,2.0,2.5,12.0,12.1,14.0,14.1
         final String supportedVersions = versionHeader.getValue();
-        LogUtils.i(LOG_TAG, "Server supports versions: %s", supportedVersions);
+        LogUtils.d(LOG_TAG, "Server supports versions: %s", supportedVersions);
         final String[] supportedVersionsArray = supportedVersions.split(",");
         // Find the most recent version we support
         String newProtocolVersion = null;
diff --git a/src/com/android/exchange/service/CalendarSyncAdapterService.java b/src/com/android/exchange/service/CalendarSyncAdapterService.java
index 376680a4..7f771936 100644
--- a/src/com/android/exchange/service/CalendarSyncAdapterService.java
+++ b/src/com/android/exchange/service/CalendarSyncAdapterService.java
@@ -25,6 +25,7 @@ import android.content.SyncResult;
 import android.database.Cursor;
 import android.os.Bundle;
 import android.provider.CalendarContract.Events;
+import android.util.Log;
 
 import com.android.emailcommon.provider.EmailContent;
 import com.android.emailcommon.provider.EmailContent.MailboxColumns;
@@ -64,11 +65,14 @@ public class CalendarSyncAdapterService extends AbstractSyncAdapterService {
         @Override
         public void onPerformSync(Account account, Bundle extras,
                 String authority, ContentProviderClient provider, SyncResult syncResult) {
-            LogUtils.i(TAG, "onPerformSync Calendar starting %s, %s", account.toString(),
-                    extras.toString());
+            if (LogUtils.isLoggable(TAG, Log.DEBUG)) {
+                LogUtils.d(TAG, "onPerformSync Calendar starting %s, %s", account.toString(),
+                        extras.toString());
+            } else {
+                LogUtils.i(TAG, "onPerformSync Calendar starting %s", extras.toString());
+            }
             CalendarSyncAdapterService.performSync(getContext(), account, extras);
-            LogUtils.i(TAG, "onPerformSync Calendar finished %s, %s", account.toString(),
-                    extras.toString());
+            LogUtils.d(TAG, "onPerformSync Calendar finished");
         }
     }
 
@@ -122,7 +126,6 @@ public class CalendarSyncAdapterService extends AbstractSyncAdapterService {
             mailExtras.putBoolean(ContentResolver.SYNC_EXTRAS_EXPEDITED, true);
         }
         ContentResolver.requestSync(account, EmailContent.AUTHORITY, mailExtras);
-        LogUtils.i(TAG, "requestSync CalendarSyncAdapter %s, %s",
-                account.toString(), mailExtras.toString());
+        LogUtils.d(TAG, "requestSync CalendarSyncAdapter %s", mailExtras.toString());
     }
 }
diff --git a/src/com/android/exchange/service/ContactsSyncAdapterService.java b/src/com/android/exchange/service/ContactsSyncAdapterService.java
index 77eac3d0..4c09617e 100644
--- a/src/com/android/exchange/service/ContactsSyncAdapterService.java
+++ b/src/com/android/exchange/service/ContactsSyncAdapterService.java
@@ -27,6 +27,7 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.provider.ContactsContract.Groups;
 import android.provider.ContactsContract.RawContacts;
+import android.util.Log;
 
 import com.android.emailcommon.provider.EmailContent;
 import com.android.emailcommon.provider.EmailContent.MailboxColumns;
@@ -64,11 +65,14 @@ public class ContactsSyncAdapterService extends AbstractSyncAdapterService {
         @Override
         public void onPerformSync(Account account, Bundle extras,
                 String authority, ContentProviderClient provider, SyncResult syncResult) {
-            LogUtils.i(TAG, "onPerformSync Contacts starting %s, %s", account.toString(),
-                    extras.toString());
+            if (LogUtils.isLoggable(TAG, Log.DEBUG)) {
+                LogUtils.d(TAG, "onPerformSync Contacts starting %s, %s", account.toString(),
+                        extras.toString());
+            } else {
+                LogUtils.i(TAG, "onPerformSync Contacts starting %s", extras.toString());
+            }
             ContactsSyncAdapterService.performSync(getContext(), account, extras);
-            LogUtils.i(TAG, "onPerformSync Contacts ending %s, %s", account.toString(),
-                    extras.toString());
+            LogUtils.d(TAG, "onPerformSync Contacts finished");
         }
     }
 
@@ -110,7 +114,7 @@ public class ContactsSyncAdapterService extends AbstractSyncAdapterService {
                 changed = hasDirtyRows(cr, uri, Groups.DIRTY);
             }
             if (!changed) {
-                LogUtils.i(TAG, "Upload sync; no changes");
+                LogUtils.d(TAG, "Upload sync; no changes");
                 return;
             }
         }
@@ -132,7 +136,6 @@ public class ContactsSyncAdapterService extends AbstractSyncAdapterService {
             mailExtras.putBoolean(ContentResolver.SYNC_EXTRAS_EXPEDITED, true);
         }
         ContentResolver.requestSync(account, EmailContent.AUTHORITY, mailExtras);
-        LogUtils.i(TAG, "requestSync ContactsSyncAdapter %s, %s",
-                account.toString(), mailExtras.toString());
+        LogUtils.d(TAG, "requestSync ContactsSyncAdapter %s", mailExtras.toString());
     }
 }
diff --git a/src/com/android/exchange/service/EasCalendarSyncHandler.java b/src/com/android/exchange/service/EasCalendarSyncHandler.java
index 396c1165..afdee7b9 100644
--- a/src/com/android/exchange/service/EasCalendarSyncHandler.java
+++ b/src/com/android/exchange/service/EasCalendarSyncHandler.java
@@ -271,7 +271,7 @@ public class EasCalendarSyncHandler extends EasSyncHandler {
 
         // Delete any orphaned exceptions
         for (final long orphan : orphanedExceptions) {
-            LogUtils.i(TAG, "Deleted orphaned exception: %d", orphan);
+            LogUtils.d(TAG, "Deleted orphaned exception: %d", orphan);
             mContentResolver.delete(asSyncAdapter(
                     ContentUris.withAppendedId(Events.CONTENT_URI, orphan)), null, null);
         }
@@ -309,7 +309,7 @@ public class EasCalendarSyncHandler extends EasSyncHandler {
                 CalendarUtilities.createMessageForEntity(mContext, entity,
                         Message.FLAG_OUTGOING_MEETING_DECLINE, clientId, mAccount);
         if (msg != null) {
-            LogUtils.i(TAG, "Queueing declined response to %s", msg.mTo);
+            LogUtils.d(TAG, "Queueing declined response to %s", msg.mTo);
             mOutgoingMailList.add(msg);
         }
     }
@@ -693,7 +693,7 @@ public class EasCalendarSyncHandler extends EasSyncHandler {
                     final Message msg = CalendarUtilities.createMessageForEntity(mContext, exEntity,
                             flag, clientId, mAccount);
                     if (msg != null) {
-                        LogUtils.i(TAG, "Queueing exception update to %s", msg.mTo);
+                        LogUtils.d(TAG, "Queueing exception update to %s", msg.mTo);
                         mOutgoingMailList.add(msg);
                     }
                 }
@@ -743,7 +743,7 @@ public class EasCalendarSyncHandler extends EasSyncHandler {
                 CalendarUtilities.createMessageForEventId(mContext, eventId,
                         Message.FLAG_OUTGOING_MEETING_INVITE, clientId, mAccount);
             if (msg != null) {
-                LogUtils.i(TAG, "Queueing invitation to %s", msg.mTo);
+                LogUtils.d(TAG, "Queueing invitation to %s", msg.mTo);
                 mOutgoingMailList.add(msg);
             }
             // Make a list out of our tokenized attendees, if we have any
@@ -790,7 +790,7 @@ public class EasCalendarSyncHandler extends EasSyncHandler {
                         removedAttendee);
                 if (cancelMsg != null) {
                     // Just send it to the removed attendee
-                    LogUtils.i(TAG, "Queueing cancellation to removed attendee %s", cancelMsg.mTo);
+                    LogUtils.d(TAG, "Queueing cancellation to removed attendee %s", cancelMsg.mTo);
                     mOutgoingMailList.add(cancelMsg);
                 }
             }
@@ -837,7 +837,7 @@ public class EasCalendarSyncHandler extends EasSyncHandler {
                     final Message msg = CalendarUtilities.createMessageForEventId(mContext, eventId,
                             messageFlag, clientId, mAccount);
                     if (msg != null) {
-                        LogUtils.i(TAG, "Queueing invitation reply to %s", msg.mTo);
+                        LogUtils.d(TAG, "Queueing invitation reply to %s", msg.mTo);
                         mOutgoingMailList.add(msg);
                     }
                 }
@@ -886,7 +886,7 @@ public class EasCalendarSyncHandler extends EasSyncHandler {
 
         if (first) {
             s.start(Tags.SYNC_COMMANDS);
-            LogUtils.i(TAG, "Sending Calendar changes to the server");
+            LogUtils.d(TAG, "Sending Calendar changes to the server");
         }
 
         final boolean selfOrganizer = organizerEmail.equalsIgnoreCase(mAccount.mEmailAddress);
@@ -899,7 +899,7 @@ public class EasCalendarSyncHandler extends EasSyncHandler {
         final long eventId = entityValues.getAsLong(Events._ID);
         if (serverId == null) {
             // This is a new event; create a clientId
-            LogUtils.i(TAG, "Creating new event with clientId: %s", clientId);
+            LogUtils.d(TAG, "Creating new event with clientId: %s", clientId);
             s.start(Tags.SYNC_ADD).data(Tags.SYNC_CLIENT_ID, clientId);
             // And save it in the Event as the local id
             final ContentValues cv = new ContentValues(2);
@@ -909,14 +909,14 @@ public class EasCalendarSyncHandler extends EasSyncHandler {
                     asSyncAdapter(ContentUris.withAppendedId(Events.CONTENT_URI, eventId)),
                     cv, null, null);
         } else if (entityValues.getAsInteger(Events.DELETED) == 1) {
-            LogUtils.i(TAG, "Deleting event with serverId: %s", serverId);
+            LogUtils.d(TAG, "Deleting event with serverId: %s", serverId);
             s.start(Tags.SYNC_DELETE).data(Tags.SYNC_SERVER_ID, serverId).end();
             mDeletedIdList.add(eventId);
             if (selfOrganizer) {
                 final Message msg = CalendarUtilities.createMessageForEventId(mContext,
                         eventId, Message.FLAG_OUTGOING_MEETING_CANCEL, null, mAccount);
                 if (msg != null) {
-                    LogUtils.i(TAG, "Queueing cancellation to %s", msg.mTo);
+                    LogUtils.d(TAG, "Queueing cancellation to %s", msg.mTo);
                     mOutgoingMailList.add(msg);
                 }
             } else {
@@ -925,7 +925,7 @@ public class EasCalendarSyncHandler extends EasSyncHandler {
             // For deletions, we don't need to add application data, so just bail here.
             return true;
         } else {
-            LogUtils.i(TAG, "Upsync change to event with serverId: %s", serverId);
+            LogUtils.d(TAG, "Upsync change to event with serverId: %s", serverId);
             s.start(Tags.SYNC_CHANGE).data(Tags.SYNC_SERVER_ID, serverId);
             // Save to the ContentResolver.
             final String version = getEntityVersion(entityValues);
diff --git a/src/com/android/exchange/service/EasContactsSyncHandler.java b/src/com/android/exchange/service/EasContactsSyncHandler.java
index 890d6302..0262a030 100644
--- a/src/com/android/exchange/service/EasContactsSyncHandler.java
+++ b/src/com/android/exchange/service/EasContactsSyncHandler.java
@@ -683,14 +683,14 @@ public class EasContactsSyncHandler extends EasSyncHandler {
                 final ArrayList<Integer> groupIds = new ArrayList<Integer>();
                 if (first) {
                     s.start(Tags.SYNC_COMMANDS);
-                    LogUtils.i(TAG, "Sending Contacts changes to the server");
+                    LogUtils.d(TAG, "Sending Contacts changes to the server");
                     first = false;
                 }
                 if (serverId == null) {
                     // This is a new contact; create a clientId
                     final String clientId =
                             "new_" + mMailbox.mId + '_' + System.currentTimeMillis();
-                    LogUtils.i(TAG, "Creating new contact with clientId: %s", clientId);
+                    LogUtils.d(TAG, "Creating new contact with clientId: %s", clientId);
                     s.start(Tags.SYNC_ADD).data(Tags.SYNC_CLIENT_ID, clientId);
                     // And save it in the raw contact
                     cidValues.put(ContactsContract.RawContacts.SYNC1, clientId);
@@ -699,13 +699,13 @@ public class EasContactsSyncHandler extends EasSyncHandler {
                             cidValues, null, null);
                 } else {
                     if (entityValues.getAsInteger(ContactsContract.RawContacts.DELETED) == 1) {
-                        LogUtils.i(TAG, "Deleting contact with serverId: %s", serverId);
+                        LogUtils.d(TAG, "Deleting contact with serverId: %s", serverId);
                         s.start(Tags.SYNC_DELETE).data(Tags.SYNC_SERVER_ID, serverId).end();
                         mDeletedContacts.add(
                                 entityValues.getAsLong(ContactsContract.RawContacts._ID));
                         continue;
                     }
-                    LogUtils.i(TAG, "Upsync change to contact with serverId: %s", serverId);
+                    LogUtils.d(TAG, "Upsync change to contact with serverId: %s", serverId);
                     s.start(Tags.SYNC_CHANGE).data(Tags.SYNC_SERVER_ID, serverId);
                 }
                 s.start(Tags.SYNC_APPLICATION_DATA);
diff --git a/src/com/android/exchange/service/EasServerConnection.java b/src/com/android/exchange/service/EasServerConnection.java
index a14a2be1..79af56fb 100644
--- a/src/com/android/exchange/service/EasServerConnection.java
+++ b/src/com/android/exchange/service/EasServerConnection.java
@@ -525,7 +525,7 @@ public class EasServerConnection {
             final String authority, final long mailboxId) {
         final Bundle extras = Mailbox.createSyncBundle(mailboxId);
         ContentResolver.requestSync(amAccount, authority, extras);
-        LogUtils.i(TAG, "requestSync EasServerConnection requestSyncForMailbox %s, %s",
+        LogUtils.d(TAG, "requestSync EasServerConnection requestSyncForMailbox %s, %s",
                 amAccount.toString(), extras.toString());
     }
 }
diff --git a/src/com/android/exchange/service/EasSyncHandler.java b/src/com/android/exchange/service/EasSyncHandler.java
index a1196c8e..da5d76db 100644
--- a/src/com/android/exchange/service/EasSyncHandler.java
+++ b/src/com/android/exchange/service/EasSyncHandler.java
@@ -265,7 +265,7 @@ public abstract class EasSyncHandler extends EasServerConnection {
     private Serializer buildEasRequest(
             final String syncKey, final boolean initialSync, int numWindows) throws IOException {
         final String className = getFolderClassName();
-        LogUtils.i(TAG, "Syncing account %d mailbox %d (class %s) with syncKey %s", mAccount.mId,
+        LogUtils.d(TAG, "Syncing account %d mailbox %d (class %s) with syncKey %s", mAccount.mId,
                 mMailbox.mId, className, syncKey);
 
         final Serializer s = new Serializer();
diff --git a/src/com/android/exchange/service/EmailSyncAdapterService.java b/src/com/android/exchange/service/EmailSyncAdapterService.java
index b88ffe6f..34cb3445 100644
--- a/src/com/android/exchange/service/EmailSyncAdapterService.java
+++ b/src/com/android/exchange/service/EmailSyncAdapterService.java
@@ -36,6 +36,7 @@ import android.provider.CalendarContract;
 import android.provider.ContactsContract;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
+import android.util.Log;
 
 import com.android.emailcommon.Api;
 import com.android.emailcommon.TempDirectory;
@@ -530,7 +531,7 @@ public class EmailSyncAdapterService extends AbstractSyncAdapterService {
 
     @Override
     public void onCreate() {
-        LogUtils.i(TAG, "onCreate()");
+        LogUtils.v(TAG, "onCreate()");
         super.onCreate();
         startService(new Intent(this, EmailSyncAdapterService.class));
         // Restart push for all accounts that need it.
@@ -540,7 +541,7 @@ public class EmailSyncAdapterService extends AbstractSyncAdapterService {
 
     @Override
     public void onDestroy() {
-        LogUtils.i(TAG, "onDestroy()");
+        LogUtils.v(TAG, "onDestroy()");
         super.onDestroy();
         for (PingTask task : mSyncHandlerMap.mPingHandlers.values()) {
             if (task != null) {
@@ -594,7 +595,11 @@ public class EmailSyncAdapterService extends AbstractSyncAdapterService {
         public void onPerformSync(final android.accounts.Account acct, final Bundle extras,
                 final String authority, final ContentProviderClient provider,
                 final SyncResult syncResult) {
-            LogUtils.i(TAG, "onPerformSync: %s, %s", acct.toString(), extras.toString());
+            if (LogUtils.isLoggable(TAG, Log.DEBUG)) {
+                LogUtils.d(TAG, "onPerformSync: %s, %s", acct.toString(), extras.toString());
+            } else {
+                LogUtils.i(TAG, "onPerformSync: %s", extras.toString());
+            }
             TempDirectory.setTempDirectory(EmailSyncAdapterService.this);
 
             // TODO: Perform any connectivity checks, bail early if we don't have proper network
@@ -611,8 +616,7 @@ public class EmailSyncAdapterService extends AbstractSyncAdapterService {
                 if (!accountCursor.moveToFirst()) {
                     // Could not load account.
                     // TODO: improve error handling.
-                    LogUtils.w(TAG, "onPerformSync: could not load account %s, %s",
-                            acct.toString(), extras.toString());
+                    LogUtils.w(TAG, "onPerformSync: could not load account");
                     return;
                 }
                 account = new Account();
@@ -638,8 +642,7 @@ public class EmailSyncAdapterService extends AbstractSyncAdapterService {
             // If we're just twiddling the push, we do the lightweight thing and bail early.
             if (pushOnly && !isFolderSync) {
                 mSyncHandlerMap.modifyPing(account);
-                LogUtils.i(TAG, "onPerformSync: mailbox push only %s, %s",
-                        acct.toString(), extras.toString());
+                LogUtils.d(TAG, "onPerformSync: mailbox push only");
                 return;
             }
 
@@ -701,7 +704,7 @@ public class EmailSyncAdapterService extends AbstractSyncAdapterService {
             // TODO: It may make sense to have common error handling here. Two possible mechanisms:
             // 1) performSync return value can signal some useful info.
             // 2) syncResult can contain useful info.
-            LogUtils.i(TAG, "onPerformSync: finished %s, %s", acct.toString(), extras.toString());
+            LogUtils.d(TAG, "onPerformSync: finished");
         }
 
         /**
diff --git a/src/com/android/exchange/service/PingTask.java b/src/com/android/exchange/service/PingTask.java
index b1cba079..87a7b8e9 100644
--- a/src/com/android/exchange/service/PingTask.java
+++ b/src/com/android/exchange/service/PingTask.java
@@ -58,6 +58,7 @@ public class PingTask extends AsyncTask<Void, Void, Void> {
 
     @Override
     protected Void doInBackground(Void... params) {
+        Log.i(TAG, "Ping task starting");
         int pingStatus;
         do {
             pingStatus = mOperation.doPing();