Unify Log Tags

Use a single log tag

Change-Id: I6f08c1eb6e84971cc21497ca14bf60860f75bab4
diff --git a/src/com/android/exchange/Eas.java b/src/com/android/exchange/Eas.java
index 396ec29..00509bb 100644
--- a/src/com/android/exchange/Eas.java
+++ b/src/com/android/exchange/Eas.java
@@ -28,7 +28,7 @@
 public class Eas {
 
     // For logging.
-    public static final String LOG_TAG = "EAS";
+    public static final String LOG_TAG = "Exchange";
 
     // For debugging
     public static boolean WAIT_DEBUG = false;   // DO NOT CHECK IN WITH THIS SET TO TRUE
diff --git a/src/com/android/exchange/Exchange.java b/src/com/android/exchange/Exchange.java
index faf2e43..8a66185 100644
--- a/src/com/android/exchange/Exchange.java
+++ b/src/com/android/exchange/Exchange.java
@@ -21,9 +21,7 @@
 import com.android.mail.utils.LogTag;
 
 public class Exchange extends Application {
-    private static final String LOG_TAG = "Exchange";
-
     static {
-        LogTag.setLogTag(LOG_TAG);
+        LogTag.setLogTag(Eas.LOG_TAG);
     }
 }
diff --git a/src/com/android/exchange/ExchangeService.java b/src/com/android/exchange/ExchangeService.java
index 8733b5c..7ebc8ff 100644
--- a/src/com/android/exchange/ExchangeService.java
+++ b/src/com/android/exchange/ExchangeService.java
@@ -24,7 +24,6 @@
 import android.content.Intent;
 import android.database.ContentObserver;
 import android.database.Cursor;
-import android.database.DatabaseUtils;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
@@ -33,8 +32,6 @@
 import android.provider.CalendarContract;
 import android.provider.CalendarContract.Calendars;
 import android.provider.CalendarContract.Events;
-import android.provider.ContactsContract;
-import android.provider.ContactsContract.RawContacts;
 
 import com.android.emailcommon.Api;
 import com.android.emailcommon.provider.Account;
@@ -54,13 +51,11 @@
 import com.android.emailsync.AbstractSyncService;
 import com.android.emailsync.PartRequest;
 import com.android.emailsync.SyncManager;
-import com.android.exchange.adapter.CalendarSyncParser;
 import com.android.exchange.adapter.Search;
 import com.android.exchange.utility.FileLogger;
 import com.android.mail.providers.UIProvider.AccountCapabilities;
 import com.android.mail.utils.LogUtils;
 
-import java.io.IOException;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
@@ -78,7 +73,7 @@
  */
 public class ExchangeService extends SyncManager {
 
-    private static final String TAG = "ExchangeService";
+    private static final String TAG = Eas.LOG_TAG;
 
     private static final String WHERE_PUSH_OR_PING_NOT_ACCOUNT_MAILBOX =
         MailboxColumns.ACCOUNT_KEY + "=? and " + MailboxColumns.TYPE + "!=" +
diff --git a/src/com/android/exchange/adapter/AbstractSyncParser.java b/src/com/android/exchange/adapter/AbstractSyncParser.java
index ecd3e71..81ec5f2 100644
--- a/src/com/android/exchange/adapter/AbstractSyncParser.java
+++ b/src/com/android/exchange/adapter/AbstractSyncParser.java
@@ -28,6 +28,7 @@
 import com.android.emailcommon.provider.Mailbox;
 import com.android.exchange.CommandStatusException;
 import com.android.exchange.CommandStatusException.CommandStatus;
+import com.android.exchange.Eas;
 import com.android.mail.utils.LogUtils;
 
 import java.io.IOException;
@@ -40,7 +41,7 @@
  *
  */
 public abstract class AbstractSyncParser extends Parser {
-    private static final String TAG = "AbstractSyncParser";
+    private static final String TAG = Eas.LOG_TAG;
 
     protected Mailbox mMailbox;
     protected Account mAccount;
@@ -195,6 +196,7 @@
 
         // If we don't have a new sync key, ignore moreAvailable (or we'll loop)
         if (moreAvailable && !newSyncKey) {
+            LogUtils.wtf(TAG, "Looping detected");
             mLooping = true;
         }
 
diff --git a/src/com/android/exchange/adapter/CalendarSyncParser.java b/src/com/android/exchange/adapter/CalendarSyncParser.java
index dc43b3c..0659024 100644
--- a/src/com/android/exchange/adapter/CalendarSyncParser.java
+++ b/src/com/android/exchange/adapter/CalendarSyncParser.java
@@ -12,16 +12,15 @@
 import android.os.RemoteException;
 import android.os.TransactionTooLargeException;
 import android.provider.CalendarContract;
-import android.provider.SyncStateContract;
 import android.provider.CalendarContract.Attendees;
 import android.provider.CalendarContract.Calendars;
 import android.provider.CalendarContract.Events;
 import android.provider.CalendarContract.ExtendedProperties;
 import android.provider.CalendarContract.Reminders;
 import android.provider.CalendarContract.SyncState;
+import android.provider.SyncStateContract;
 import android.text.format.DateUtils;
 
-import com.android.emailcommon.Logging;
 import com.android.emailcommon.provider.Account;
 import com.android.emailcommon.provider.Mailbox;
 import com.android.emailcommon.utility.Utility;
@@ -36,11 +35,11 @@
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.GregorianCalendar;
-import java.util.TimeZone;
 import java.util.Map.Entry;
+import java.util.TimeZone;
 
 public class CalendarSyncParser extends AbstractSyncParser {
-    private static final String TAG = Logging.LOG_TAG;
+    private static final String TAG = Eas.LOG_TAG;
 
     private final TimeZone UTC_TIMEZONE = TimeZone.getTimeZone("UTC");
     private final TimeZone mLocalTimeZone = TimeZone.getDefault();
diff --git a/src/com/android/exchange/adapter/ContactsSyncParser.java b/src/com/android/exchange/adapter/ContactsSyncParser.java
index 5704f57..91143a5 100644
--- a/src/com/android/exchange/adapter/ContactsSyncParser.java
+++ b/src/com/android/exchange/adapter/ContactsSyncParser.java
@@ -51,7 +51,7 @@
 import java.util.TimeZone;
 
 public class ContactsSyncParser extends AbstractSyncParser {
-    private static final String TAG = "ContactsSyncParser";
+    private static final String TAG = Eas.LOG_TAG;
 
     private static final String SERVER_ID_SELECTION = RawContacts.SOURCE_ID + "=?";
     private static final String CLIENT_ID_SELECTION = RawContacts.SYNC1 + "=?";
diff --git a/src/com/android/exchange/adapter/EmailSyncAdapter.java b/src/com/android/exchange/adapter/EmailSyncAdapter.java
index 67c210f..26e56ff 100644
--- a/src/com/android/exchange/adapter/EmailSyncAdapter.java
+++ b/src/com/android/exchange/adapter/EmailSyncAdapter.java
@@ -87,7 +87,7 @@
  */
 public class EmailSyncAdapter extends AbstractSyncAdapter {
 
-    private static final String TAG = "EmailSyncAdapter";
+    private static final String TAG = Eas.LOG_TAG;
 
     private static final int UPDATES_READ_COLUMN = 0;
     private static final int UPDATES_MAILBOX_KEY_COLUMN = 1;
@@ -333,7 +333,6 @@
     }
 
     private static class GetItemEstimateParser extends Parser {
-        private static final String TAG = "GetItemEstimateParser";
         private int mEstimate = -1;
 
         public GetItemEstimateParser(InputStream in) throws IOException {
diff --git a/src/com/android/exchange/adapter/EmailSyncParser.java b/src/com/android/exchange/adapter/EmailSyncParser.java
index 16f68d1..6602bc5 100644
--- a/src/com/android/exchange/adapter/EmailSyncParser.java
+++ b/src/com/android/exchange/adapter/EmailSyncParser.java
@@ -51,7 +51,7 @@
  * Parser for Sync on an email collection.
  */
 public class EmailSyncParser extends AbstractSyncParser {
-    private static final String TAG = "EmailSyncParser";
+    private static final String TAG = Eas.LOG_TAG;
 
     private static final String WHERE_SERVER_ID_AND_MAILBOX_KEY = EmailContent.SyncColumns.SERVER_ID
             + "=? and " + EmailContent.MessageColumns.MAILBOX_KEY + "=?";
diff --git a/src/com/android/exchange/adapter/MeetingResponseParser.java b/src/com/android/exchange/adapter/MeetingResponseParser.java
index dbfda19..3849acd 100644
--- a/src/com/android/exchange/adapter/MeetingResponseParser.java
+++ b/src/com/android/exchange/adapter/MeetingResponseParser.java
@@ -15,6 +15,7 @@
 
 package com.android.exchange.adapter;
 
+import com.android.exchange.Eas;
 import com.android.mail.utils.LogUtils;
 
 import java.io.IOException;
@@ -24,7 +25,7 @@
  * Parse the result of a MeetingRequest command.
  */
 public class MeetingResponseParser extends Parser {
-    private static final String TAG = "MeetingResponseParser";
+    private static final String TAG = Eas.LOG_TAG;
 
     public MeetingResponseParser(final InputStream in) throws IOException {
         super(in);
diff --git a/src/com/android/exchange/adapter/MoveItemsParser.java b/src/com/android/exchange/adapter/MoveItemsParser.java
index be11727..f593bcf 100644
--- a/src/com/android/exchange/adapter/MoveItemsParser.java
+++ b/src/com/android/exchange/adapter/MoveItemsParser.java
@@ -15,6 +15,7 @@
 
 package com.android.exchange.adapter;
 
+import com.android.exchange.Eas;
 import com.android.mail.utils.LogUtils;
 
 import java.io.IOException;
@@ -24,7 +25,7 @@
  * Parse the result of a MoveItems command.
  */
 public class MoveItemsParser extends Parser {
-    private static final String TAG = "MoveItemsParser";
+    private static final String TAG = Eas.LOG_TAG;
     private int mStatusCode = 0;
     private String mNewServerId;
     private String mSourceServerId;
diff --git a/src/com/android/exchange/adapter/Parser.java b/src/com/android/exchange/adapter/Parser.java
index 8064e8b..aced374 100644
--- a/src/com/android/exchange/adapter/Parser.java
+++ b/src/com/android/exchange/adapter/Parser.java
@@ -40,7 +40,7 @@
 public abstract class Parser {
     private static final boolean LOG_VERBOSE = false;
 
-    private static final String LOG_TAG = "EAS Parser";
+    private static final String LOG_TAG = Eas.LOG_TAG;
 
     // The following constants are Wbxml standard
     public static final int START_DOCUMENT = 0;
diff --git a/src/com/android/exchange/adapter/PingParser.java b/src/com/android/exchange/adapter/PingParser.java
index 3e20c1b..0c9dbc7 100644
--- a/src/com/android/exchange/adapter/PingParser.java
+++ b/src/com/android/exchange/adapter/PingParser.java
@@ -16,6 +16,7 @@
 
 package com.android.exchange.adapter;
 
+import com.android.exchange.Eas;
 import com.android.mail.utils.LogUtils;
 
 import java.io.IOException;
@@ -29,7 +30,7 @@
  * {@link #getHeartbeatInterval()} will contain further detailed results of the parsing.
  */
 public class PingParser extends Parser {
-    private static final String TAG = "PingParser";
+    private static final String TAG = Eas.LOG_TAG;
 
     /** Sentinel value, used when some property doesn't have a meaningful value. */
     public static final int NO_VALUE = -1;
diff --git a/src/com/android/exchange/adapter/ProvisionParser.java b/src/com/android/exchange/adapter/ProvisionParser.java
index 5eb892c..08f0ed7 100644
--- a/src/com/android/exchange/adapter/ProvisionParser.java
+++ b/src/com/android/exchange/adapter/ProvisionParser.java
@@ -21,6 +21,7 @@
 import android.os.storage.StorageManager;
 
 import com.android.emailcommon.provider.Policy;
+import com.android.exchange.Eas;
 import com.android.exchange.R;
 import com.android.exchange.eas.EasProvision;
 import com.android.mail.utils.LogUtils;
@@ -40,7 +41,7 @@
  * Parse the result of the Provision command
  */
 public class ProvisionParser extends Parser {
-    private static final String TAG = "ProvisionParser";
+    private static final String TAG = Eas.LOG_TAG;
 
     private final Context mContext;
     private Policy mPolicy = null;
diff --git a/src/com/android/exchange/adapter/Serializer.java b/src/com/android/exchange/adapter/Serializer.java
index 626d387..3511c88 100644
--- a/src/com/android/exchange/adapter/Serializer.java
+++ b/src/com/android/exchange/adapter/Serializer.java
@@ -36,7 +36,7 @@
 import java.io.OutputStream;
 
 public class Serializer {
-    private static final String TAG = "Serializer";
+    private static final String TAG = Eas.LOG_TAG;
     private static final int BUFFER_SIZE = 16*1024;
     private static final int NOT_PENDING = -1;
 
diff --git a/src/com/android/exchange/adapter/SettingsParser.java b/src/com/android/exchange/adapter/SettingsParser.java
index 8c493c6..1f177dc 100644
--- a/src/com/android/exchange/adapter/SettingsParser.java
+++ b/src/com/android/exchange/adapter/SettingsParser.java
@@ -15,6 +15,7 @@
 
 package com.android.exchange.adapter;
 
+import com.android.exchange.Eas;
 import com.android.mail.utils.LogUtils;
 
 import java.io.IOException;
@@ -29,7 +30,7 @@
  */
 public class SettingsParser extends Parser {
 
-    private static final String TAG = "SettingsParser";
+    private static final String TAG = Eas.LOG_TAG;
 
     public SettingsParser(InputStream in) throws IOException {
         super(in);
diff --git a/src/com/android/exchange/eas/EasOptions.java b/src/com/android/exchange/eas/EasOptions.java
index 7e44609..3ef1070 100644
--- a/src/com/android/exchange/eas/EasOptions.java
+++ b/src/com/android/exchange/eas/EasOptions.java
@@ -33,7 +33,7 @@
  * version.
  */
 public class EasOptions extends EasOperation {
-    private static final String LOG_TAG = "EasOptions";
+    private static final String LOG_TAG = Eas.LOG_TAG;
 
     /** Result code indicating we successfully got a protocol version. */
     public static final int RESULT_OK = 1;
diff --git a/src/com/android/exchange/eas/EasPing.java b/src/com/android/exchange/eas/EasPing.java
index 49d9a6a..73f75ba 100644
--- a/src/com/android/exchange/eas/EasPing.java
+++ b/src/com/android/exchange/eas/EasPing.java
@@ -17,12 +17,10 @@
 package com.android.exchange.eas;
 
 import android.content.ContentResolver;
-import android.content.ContentUris;
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.SyncResult;
 import android.database.Cursor;
-import android.net.Uri;
 import android.os.SystemClock;
 import android.text.format.DateUtils;
 
@@ -48,7 +46,7 @@
  * See http://msdn.microsoft.com/en-us/library/ee200913(v=exchg.80).aspx for more details.
  */
 public class EasPing extends EasOperation {
-    private static final String TAG = "EasPing";
+    private static final String TAG = Eas.LOG_TAG;
 
     private static final String WHERE_ACCOUNT_KEY_AND_SERVER_ID =
             MailboxColumns.ACCOUNT_KEY + "=? and " + MailboxColumns.SERVER_ID + "=?";
diff --git a/src/com/android/exchange/eas/EasProvision.java b/src/com/android/exchange/eas/EasProvision.java
index aa9484e..cad2565 100644
--- a/src/com/android/exchange/eas/EasProvision.java
+++ b/src/com/android/exchange/eas/EasProvision.java
@@ -46,7 +46,7 @@
  */
 public class EasProvision extends EasOperation {
 
-    private static final String LOG_TAG = "EasProvision";
+    private static final String LOG_TAG = Eas.LOG_TAG;
 
     /** The policy type for versions of EAS prior to 2007. */
     public static final String EAS_2_POLICY_TYPE = "MS-WAP-Provisioning-XML";
diff --git a/src/com/android/exchange/service/CalendarSyncAdapterService.java b/src/com/android/exchange/service/CalendarSyncAdapterService.java
index f2de310..b32a870 100644
--- a/src/com/android/exchange/service/CalendarSyncAdapterService.java
+++ b/src/com/android/exchange/service/CalendarSyncAdapterService.java
@@ -34,7 +34,7 @@
 import com.android.mail.utils.LogUtils;
 
 public class CalendarSyncAdapterService extends AbstractSyncAdapterService {
-    private static final String TAG = "EASCalSyncAdaptSvc";
+    private static final String TAG = Eas.LOG_TAG;
     private static final String ACCOUNT_AND_TYPE_CALENDAR =
         MailboxColumns.ACCOUNT_KEY + "=? AND " + MailboxColumns.TYPE + '=' + Mailbox.TYPE_CALENDAR;
     private static final String DIRTY_IN_ACCOUNT =
diff --git a/src/com/android/exchange/service/ContactsSyncAdapterService.java b/src/com/android/exchange/service/ContactsSyncAdapterService.java
index e2dd7e3..6533771 100644
--- a/src/com/android/exchange/service/ContactsSyncAdapterService.java
+++ b/src/com/android/exchange/service/ContactsSyncAdapterService.java
@@ -36,7 +36,7 @@
 import com.android.mail.utils.LogUtils;
 
 public class ContactsSyncAdapterService extends AbstractSyncAdapterService {
-    private static final String TAG = "EASContactSyncAdaptSvc";
+    private static final String TAG = Eas.LOG_TAG;
     private static final String ACCOUNT_AND_TYPE_CONTACTS =
         MailboxColumns.ACCOUNT_KEY + "=? AND " + MailboxColumns.TYPE + '=' + Mailbox.TYPE_CONTACTS;
 
diff --git a/src/com/android/exchange/service/EasAttachmentLoader.java b/src/com/android/exchange/service/EasAttachmentLoader.java
index e496b2f..d563931 100644
--- a/src/com/android/exchange/service/EasAttachmentLoader.java
+++ b/src/com/android/exchange/service/EasAttachmentLoader.java
@@ -33,7 +33,7 @@
  * TODO: Add ability to call back to UI when this failed, and generally better handle error cases.
  */
 public class EasAttachmentLoader extends EasServerConnection {
-    private static final String TAG = "EasAttachmentLoader";
+    private static final String TAG = Eas.LOG_TAG;
 
     private final IEmailServiceCallback mCallback;
 
diff --git a/src/com/android/exchange/service/EasAutoDiscover.java b/src/com/android/exchange/service/EasAutoDiscover.java
index d2366f2..4f7558e 100644
--- a/src/com/android/exchange/service/EasAutoDiscover.java
+++ b/src/com/android/exchange/service/EasAutoDiscover.java
@@ -30,7 +30,7 @@
  * options needed based on just a username and password.
  */
 public class EasAutoDiscover extends EasServerConnection {
-    private static final String TAG = "EasAutoDiscover";
+    private static final String TAG = Eas.LOG_TAG;
 
     private static final String AUTO_DISCOVER_SCHEMA_PREFIX =
         "http://schemas.microsoft.com/exchange/autodiscover/mobilesync/";
diff --git a/src/com/android/exchange/service/EasCalendarSyncHandler.java b/src/com/android/exchange/service/EasCalendarSyncHandler.java
index 3646fca..208bcea 100644
--- a/src/com/android/exchange/service/EasCalendarSyncHandler.java
+++ b/src/com/android/exchange/service/EasCalendarSyncHandler.java
@@ -48,7 +48,7 @@
  * Performs an Exchange Sync for a Calendar collection.
  */
 public class EasCalendarSyncHandler extends EasSyncHandler {
-    private static final String TAG = "EasCalendarSyncHandler";
+    private static final String TAG = Eas.LOG_TAG;
 
     // TODO: Some constants are copied from CalendarSyncAdapter and are still used by the parser.
     // These values need to stay in sync; when the parser is cleaned up, be sure to unify them.
diff --git a/src/com/android/exchange/service/EasContactsSyncHandler.java b/src/com/android/exchange/service/EasContactsSyncHandler.java
index dcc62fc..cca8a88 100644
--- a/src/com/android/exchange/service/EasContactsSyncHandler.java
+++ b/src/com/android/exchange/service/EasContactsSyncHandler.java
@@ -49,7 +49,7 @@
  * The Mailbox in the Email DB is only useful for serverId and syncInterval.
  */
 public class EasContactsSyncHandler extends EasSyncHandler {
-    private static final String TAG = "EasContactsSyncHandler";
+    private static final String TAG = Eas.LOG_TAG;
 
     private static final String MIMETYPE_GROUP_MEMBERSHIP_AND_ID_EQUALS =
             ContactsContract.Data.MIMETYPE + "='" + GroupMembership.CONTENT_ITEM_TYPE + "' AND " +
diff --git a/src/com/android/exchange/service/EasMeetingResponder.java b/src/com/android/exchange/service/EasMeetingResponder.java
index b9aad1d..2e6efd3 100644
--- a/src/com/android/exchange/service/EasMeetingResponder.java
+++ b/src/com/android/exchange/service/EasMeetingResponder.java
@@ -16,6 +16,7 @@
 import com.android.emailcommon.provider.Mailbox;
 import com.android.emailcommon.service.EmailServiceConstants;
 import com.android.emailcommon.utility.Utility;
+import com.android.exchange.Eas;
 import com.android.exchange.EasResponse;
 import com.android.exchange.adapter.MeetingResponseParser;
 import com.android.exchange.adapter.Serializer;
@@ -33,7 +34,7 @@
  */
 public class EasMeetingResponder extends EasServerConnection {
 
-    private static final String TAG = "EasMeetingResponder";
+    private static final String TAG = Eas.LOG_TAG;
 
     /** Projection for getting the server id for a mailbox. */
     private static final String[] MAILBOX_SERVER_ID_PROJECTION = { MailboxColumns.SERVER_ID };
diff --git a/src/com/android/exchange/service/EasServerConnection.java b/src/com/android/exchange/service/EasServerConnection.java
index c6577c1..6187a8a 100644
--- a/src/com/android/exchange/service/EasServerConnection.java
+++ b/src/com/android/exchange/service/EasServerConnection.java
@@ -72,7 +72,7 @@
  */
 public class EasServerConnection {
     /** Logging tag. */
-    private static final String TAG = "EasServerConnection";
+    private static final String TAG = Eas.LOG_TAG;
 
     /**
      * Timeout for establishing a connection to the server.
diff --git a/src/com/android/exchange/service/EasSyncHandler.java b/src/com/android/exchange/service/EasSyncHandler.java
index 02ba144..4c153f2 100644
--- a/src/com/android/exchange/service/EasSyncHandler.java
+++ b/src/com/android/exchange/service/EasSyncHandler.java
@@ -74,7 +74,7 @@
  *   other necessary cleanups after parsing a Sync response. These are handled in {@link #cleanup}.
  */
 public abstract class EasSyncHandler extends EasServerConnection {
-    private static final String TAG = "EasSyncHandler";
+    private static final String TAG = Eas.LOG_TAG;
 
     /** Window sizes for PIM (contact & calendar) sync options. */
     public static final int PIM_WINDOW_SIZE_CONTACTS = 10;
@@ -375,10 +375,18 @@
         //syncMailboxStatus(EmailServiceStatus.IN_PROGRESS, 0);
         int syncResult = SYNC_RESULT_MORE_AVAILABLE;
         int loopingCount = 0;
+        String key = getSyncKey();
         while (syncResult == SYNC_RESULT_MORE_AVAILABLE && loopingCount < MAX_LOOPING_COUNT) {
             syncResult = performOneSync();
             // TODO: Clear pending request queue.
             ++loopingCount;
+            final String newKey = getSyncKey();
+            if (syncResult == SYNC_RESULT_MORE_AVAILABLE && key.equals(newKey)) {
+                LogUtils.wtf(TAG,
+                        "Server has more data but we have the same key: %s loopingCount: %d",
+                        key, loopingCount);
+            }
+            key = newKey;
         }
         if (syncResult == SYNC_RESULT_MORE_AVAILABLE) {
             // TODO: Signal caller that it probably wants to sync again.
diff --git a/src/com/android/exchange/service/EmailSyncAdapterService.java b/src/com/android/exchange/service/EmailSyncAdapterService.java
index e8a5b05..28140be 100644
--- a/src/com/android/exchange/service/EmailSyncAdapterService.java
+++ b/src/com/android/exchange/service/EmailSyncAdapterService.java
@@ -63,7 +63,7 @@
  */
 public class EmailSyncAdapterService extends AbstractSyncAdapterService {
 
-    private static final String TAG = "EASEmailSyncAdaptSvc";
+    private static final String TAG = Eas.LOG_TAG;
 
     /**
      * If sync extras do not include a mailbox id, then we want to perform a full sync.
diff --git a/src/com/android/exchange/utility/CalendarUtilities.java b/src/com/android/exchange/utility/CalendarUtilities.java
index 63322bf..a7b213f 100644
--- a/src/com/android/exchange/utility/CalendarUtilities.java
+++ b/src/com/android/exchange/utility/CalendarUtilities.java
@@ -64,7 +64,7 @@
 public class CalendarUtilities {
 
     // NOTE: Most definitions in this class are have package visibility for testing purposes
-    private static final String TAG = "CalendarUtility";
+    private static final String TAG = Eas.LOG_TAG;
 
     // Time related convenience constants, in milliseconds
     static final int SECONDS = 1000;