diff options
Diffstat (limited to 'emailsync')
3 files changed, 22 insertions, 20 deletions
diff --git a/emailsync/src/com/android/emailsync/AbstractSyncService.java b/emailsync/src/com/android/emailsync/AbstractSyncService.java index 45765545c..002e20e97 100644 --- a/emailsync/src/com/android/emailsync/AbstractSyncService.java +++ b/emailsync/src/com/android/emailsync/AbstractSyncService.java @@ -22,11 +22,11 @@ import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.os.Bundle; import android.text.format.DateUtils; -import android.util.Log; import com.android.emailcommon.provider.Account; import com.android.emailcommon.provider.HostAuth; import com.android.emailcommon.provider.Mailbox; +import com.android.mail.utils.LogUtils; import java.util.concurrent.LinkedBlockingQueue; @@ -205,9 +205,9 @@ public abstract class AbstractSyncService implements Runnable { public void userLog(String str, Exception e) { if (mUserLog) { - Log.e(TAG, str, e); + LogUtils.e(TAG, str, e); } else { - Log.e(TAG, str + e); + LogUtils.e(TAG, str + e); } if (mFileLog) { FileLogger.log(e); @@ -216,7 +216,7 @@ public abstract class AbstractSyncService implements Runnable { /** * Standard logging for EAS. - * If user logging is active, we concatenate any arguments and log them using Log.d + * If user logging is active, we concatenate any arguments and log them using LogUtils.d * We also check for file logging, and log appropriately * @param strings strings to concatenate and log */ @@ -232,7 +232,7 @@ public abstract class AbstractSyncService implements Runnable { } logText = sb.toString(); } - Log.d(TAG, logText); + LogUtils.d(TAG, logText); if (mFileLog) { FileLogger.log(TAG, logText); } @@ -244,7 +244,7 @@ public abstract class AbstractSyncService implements Runnable { * @param str the string to log */ public void errorLog(String str) { - Log.e(TAG, str); + LogUtils.e(TAG, str); if (mFileLog) { FileLogger.log(TAG, str); } diff --git a/emailsync/src/com/android/emailsync/EmailSyncAlarmReceiver.java b/emailsync/src/com/android/emailsync/EmailSyncAlarmReceiver.java index 8ac0f0633..a52c7e53a 100644 --- a/emailsync/src/com/android/emailsync/EmailSyncAlarmReceiver.java +++ b/emailsync/src/com/android/emailsync/EmailSyncAlarmReceiver.java @@ -22,11 +22,11 @@ import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.database.Cursor; -import android.util.Log; import com.android.emailcommon.provider.EmailContent.Message; import com.android.emailcommon.provider.EmailContent.MessageColumns; import com.android.emailcommon.provider.ProviderUnavailableException; +import com.android.mail.utils.LogUtils; import java.util.ArrayList; @@ -54,6 +54,7 @@ public class EmailSyncAlarmReceiver extends BroadcastReceiver { @Override public void onReceive(final Context context, Intent intent) { new Thread(new Runnable() { + @Override public void run() { handleReceive(context); } @@ -105,7 +106,8 @@ public class EmailSyncAlarmReceiver extends BroadcastReceiver { SyncManager.serviceRequest(mailboxId, SyncManager.SYNC_UPSYNC); } } catch (ProviderUnavailableException e) { - Log.e("EmailSyncAlarmReceiver", "EmailProvider unavailable; aborting alarm receiver"); + LogUtils.e("EmailSyncAlarmReceiver", + "EmailProvider unavailable; aborting alarm receiver"); } } } diff --git a/emailsync/src/com/android/emailsync/SyncManager.java b/emailsync/src/com/android/emailsync/SyncManager.java index 390381abc..e1f1fea2c 100644 --- a/emailsync/src/com/android/emailsync/SyncManager.java +++ b/emailsync/src/com/android/emailsync/SyncManager.java @@ -43,7 +43,6 @@ import android.provider.CalendarContract; import android.provider.CalendarContract.Calendars; import android.provider.CalendarContract.Events; import android.provider.ContactsContract; -import android.util.Log; import com.android.emailcommon.TempDirectory; import com.android.emailcommon.provider.Account; @@ -63,9 +62,9 @@ import com.android.emailcommon.service.EmailServiceProxy; import com.android.emailcommon.service.EmailServiceStatus; import com.android.emailcommon.service.IEmailServiceCallback.Stub; import com.android.emailcommon.service.PolicyServiceProxy; -import com.android.emailcommon.utility.EmailAsyncTask; import com.android.emailcommon.utility.EmailClientConnectionManager; import com.android.emailcommon.utility.Utility; +import com.android.mail.utils.LogUtils; import org.apache.http.conn.params.ConnManagerPNames; import org.apache.http.conn.params.ConnPerRoute; @@ -74,7 +73,6 @@ import org.apache.http.params.BasicHttpParams; import org.apache.http.params.HttpParams; import java.io.FileDescriptor; -import java.io.IOException; import java.io.PrintWriter; import java.util.ArrayList; import java.util.HashMap; @@ -339,10 +337,11 @@ public abstract class SyncManager extends Service implements Runnable { if (sFileLog) { sUserLog = true; } - Log.d("Sync Debug", "Logging: " + (sUserLog ? "User " : "") + (sFileLog ? "File" : "")); + LogUtils.d("Sync Debug", "Logging: " + (sUserLog ? "User " : "") + + (sFileLog ? "File" : "")); } - private boolean onSecurityHold(Account account) { + private static boolean onSecurityHold(Account account) { return (account.mFlags & Account.FLAGS_SECURITY_HOLD) != 0; } @@ -688,7 +687,7 @@ public abstract class SyncManager extends Service implements Runnable { c.close(); } } catch (ProviderUnavailableException e) { - Log.w(TAG, "Observer failed; provider unavailable"); + LogUtils.w(TAG, "Observer failed; provider unavailable"); } }}, "Calendar Observer").start(); } @@ -850,7 +849,7 @@ public abstract class SyncManager extends Service implements Runnable { public static void log(String tag, String str) { if (sUserLog) { - Log.d(tag, str); + LogUtils.d(tag, str); if (sFileLog) { FileLogger.log(tag, str); } @@ -859,7 +858,7 @@ public abstract class SyncManager extends Service implements Runnable { public static void alwaysLog(String str) { if (!sUserLog) { - Log.d(TAG, str); + LogUtils.d(TAG, str); } else { log(str); } @@ -1142,7 +1141,8 @@ public abstract class SyncManager extends Service implements Runnable { // We ignore drafts completely (doesn't sync). Changes in Outbox are // handled in the checkMailboxes loop, so we can ignore these pings. if (sUserLog) { - Log.d(TAG, "Alert for mailbox " + id + " (" + m.mDisplayName + ")"); + LogUtils.d(TAG, "Alert for mailbox " + id + " (" + + m.mDisplayName + ")"); } if (m.mType == Mailbox.TYPE_DRAFTS || m.mType == Mailbox.TYPE_OUTBOX) { String[] args = new String[] {Long.toString(m.mId)}; @@ -1572,12 +1572,12 @@ public abstract class SyncManager extends Service implements Runnable { // NOTE: Sync adapters will also crash with this error, but that is already handled // in the adapters themselves, i.e. they return cleanly via done(). When the Email // process starts running again, remote processes will be started again in due course - Log.e(TAG, "EmailProvider unavailable; shutting down"); + LogUtils.e(TAG, "EmailProvider unavailable; shutting down"); // Ask for our service to be restarted; this should kick-start the Email process as well startService(new Intent(this, SyncManager.class)); } catch (RuntimeException e) { // Crash; this is a completely unexpected runtime error - Log.e(TAG, "RuntimeException", e); + LogUtils.e(TAG, "RuntimeException", e); throw e; } finally { shutdown(); @@ -1737,7 +1737,7 @@ public abstract class SyncManager extends Service implements Runnable { * @param account the Account in question * @return whether Email sync is enabled */ - private boolean canSyncEmail(android.accounts.Account account) { + private static boolean canSyncEmail(android.accounts.Account account) { return ContentResolver.getSyncAutomatically(account, EmailContent.AUTHORITY); } |