From 921c04d2ac5df091fb3c5cfa823e6dc2fc6cdf5a Mon Sep 17 00:00:00 2001 From: Martin Hibdon Date: Tue, 1 Oct 2013 16:11:54 -0700 Subject: [PATCH] Add some logging Change-Id: Ib26ffad0bb6841361b8ee7be4ee2a6255d509ae2 --- emailcommon/src/com/android/emailcommon/provider/Mailbox.java | 2 ++ src/com/android/email/SecurityPolicy.java | 2 ++ src/com/android/email/provider/EmailProvider.java | 4 ++++ src/com/android/email/service/EmailServiceStub.java | 2 ++ src/com/android/email/service/PopImapSyncAdapterService.java | 2 ++ 5 files changed, 12 insertions(+) diff --git a/emailcommon/src/com/android/emailcommon/provider/Mailbox.java b/emailcommon/src/com/android/emailcommon/provider/Mailbox.java index ff4bb60c1..db72662e2 100644 --- a/emailcommon/src/com/android/emailcommon/provider/Mailbox.java +++ b/emailcommon/src/com/android/emailcommon/provider/Mailbox.java @@ -882,6 +882,8 @@ public class Mailbox extends EmailContent implements MailboxColumns, Parcelable extras.putLong(SYNC_EXTRA_MAILBOX_ID, mailboxId); extras.putBoolean(ContentResolver.SYNC_EXTRAS_IGNORE_SETTINGS, true); ContentResolver.requestSync(account, AUTHORITY, extras); + LogUtils.i(Logging.LOG_TAG, "requestSync resyncMailbox %s, %s", + account.toString(), extras.toString()); } catch (RemoteException e) { LogUtils.w(Logging.LOG_TAG, e, "Failed to wipe mailbox %d", mailboxId); } catch (OperationApplicationException e) { diff --git a/src/com/android/email/SecurityPolicy.java b/src/com/android/email/SecurityPolicy.java index 3305e1201..fa63c840b 100644 --- a/src/com/android/email/SecurityPolicy.java +++ b/src/com/android/email/SecurityPolicy.java @@ -574,6 +574,8 @@ public class SecurityPolicy { extras.putBoolean(ContentResolver.SYNC_EXTRAS_DO_NOT_RETRY, true); extras.putBoolean(ContentResolver.SYNC_EXTRAS_EXPEDITED, true); ContentResolver.requestSync(amAccount, EmailContent.AUTHORITY, extras); + LogUtils.i(TAG, "requestSync SecurityPolicy syncAccount %s, %s", account.toString(), + extras.toString()); } public void syncAccount(final Account account) { diff --git a/src/com/android/email/provider/EmailProvider.java b/src/com/android/email/provider/EmailProvider.java index f33b5548d..041e27ab0 100644 --- a/src/com/android/email/provider/EmailProvider.java +++ b/src/com/android/email/provider/EmailProvider.java @@ -4936,6 +4936,8 @@ public class EmailProvider extends ContentProvider { extras.putString(EmailServiceStatus.SYNC_EXTRAS_CALLBACK_METHOD, SYNC_STATUS_CALLBACK_METHOD); ContentResolver.requestSync(account, EmailContent.AUTHORITY, extras); + LogUtils.i(TAG, "requestSync EmailProvider startSync %s, %s", account.toString(), + extras.toString()); } /** @@ -5273,6 +5275,8 @@ public class EmailProvider extends ContentProvider { final Bundle extras = new Bundle(); extras.putLong(Mailbox.SYNC_EXTRA_MAILBOX_ID, request.mMailboxId); ContentResolver.requestSync(account, request.mAuthority, extras); + LogUtils.i(TAG, "requestSync getDelayedSyncHandler %s, %s", + account.toString(), extras.toString()); mDelayedSyncRequests.remove(request); return true; } diff --git a/src/com/android/email/service/EmailServiceStub.java b/src/com/android/email/service/EmailServiceStub.java index f7f4f4202..d0db8bf84 100644 --- a/src/com/android/email/service/EmailServiceStub.java +++ b/src/com/android/email/service/EmailServiceStub.java @@ -121,6 +121,8 @@ public abstract class EmailServiceStub extends IEmailService.Stub implements IEm extras.putInt(Mailbox.SYNC_EXTRA_DELTA_MESSAGE_COUNT, deltaMessageCount); } ContentResolver.requestSync(acct, EmailContent.AUTHORITY, extras); + LogUtils.i(Logging.LOG_TAG, "requestSync EmailServiceStub startSync %s, %s", + account.toString(), extras.toString()); } @Override diff --git a/src/com/android/email/service/PopImapSyncAdapterService.java b/src/com/android/email/service/PopImapSyncAdapterService.java index 2f817bff0..43f8e1211 100644 --- a/src/com/android/email/service/PopImapSyncAdapterService.java +++ b/src/com/android/email/service/PopImapSyncAdapterService.java @@ -143,6 +143,8 @@ public class PopImapSyncAdapterService extends Service { } } catch (MessagingException e) { int cause = e.getExceptionType(); + // XXX It's no good to put the MessagingException.cause here, that's not the + // same set of values that we use in EmailServiceStatus. EmailServiceStatus.syncMailboxStatus(resolver, extras, mailboxId, cause, 0); switch(cause) { case MessagingException.IOERROR: