diff --git a/src/com/android/exchange/EasSyncService.java b/src/com/android/exchange/EasSyncService.java index 02b5209bb..c62971c81 100644 --- a/src/com/android/exchange/EasSyncService.java +++ b/src/com/android/exchange/EasSyncService.java @@ -101,8 +101,8 @@ import java.util.ArrayList; import java.util.HashMap; public class EasSyncService extends AbstractSyncService { - // STOPSHIP - DO NOT RELEASE AS 'TRUE' - public static final boolean DEBUG_GAL_SERVICE = true; + // DO NOT CHECK IN SET TO TRUE + public static final boolean DEBUG_GAL_SERVICE = false; private static final String EMAIL_WINDOW_SIZE = "5"; public static final String PIM_WINDOW_SIZE = "5"; @@ -1939,12 +1939,6 @@ public class EasSyncService extends AbstractSyncService { Serializer s = new Serializer(); String className = target.getCollectionName(); - - // STOPSHIP Remove the following if statement; temporary logging for Calendar sync - if (className.equals("Calendar") && Eas.PARSER_LOG) { - s = new Serializer(true, true); - } - String syncKey = target.getSyncKey(); userLog("sync, sending ", className, " syncKey: ", syncKey); s.start(Tags.SYNC_SYNC) diff --git a/src/com/android/exchange/provider/GalEmailAddressAdapter.java b/src/com/android/exchange/provider/GalEmailAddressAdapter.java index c74043730..e0e3f4fe1 100644 --- a/src/com/android/exchange/provider/GalEmailAddressAdapter.java +++ b/src/com/android/exchange/provider/GalEmailAddressAdapter.java @@ -38,8 +38,8 @@ import android.widget.TextView; * Email Address adapter that performs asynchronous GAL lookups. */ public class GalEmailAddressAdapter extends EmailAddressAdapter { - // STOPSHIP - DO NOT RELEASE AS 'TRUE' - private static final boolean DEBUG_GAL_LOG = true; + // DO NOT CHECK IN SET TO TRUE + private static final boolean DEBUG_GAL_LOG = false; // Don't run GAL query until there are 3 characters typed private static final int MINIMUM_GAL_CONSTRAINT_LENGTH = 3;