From e7ebb5de04e2419763459883f37f45ee0d27e4c7 Mon Sep 17 00:00:00 2001 From: Yu Ping Hu Date: Wed, 19 Jun 2013 17:10:43 -0700 Subject: [PATCH] Remove references to deprecated sync states. Change-Id: Ib22bac766fb0ac4d6e764ee92b56a8026baee852 --- .../src/com/android/emailcommon/provider/Mailbox.java | 2 ++ src/com/android/email/activity/setup/MailboxSettings.java | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/emailcommon/src/com/android/emailcommon/provider/Mailbox.java b/emailcommon/src/com/android/emailcommon/provider/Mailbox.java index 3ea1d0433..368367598 100644 --- a/emailcommon/src/com/android/emailcommon/provider/Mailbox.java +++ b/emailcommon/src/com/android/emailcommon/provider/Mailbox.java @@ -128,8 +128,10 @@ public class Mailbox extends EmailContent implements MailboxColumns, Parcelable public static final int CHECK_INTERVAL_PUSH = -2; // The following two sentinel values are used by EAS // Ping indicates that the EAS mailbox is synced based on a "ping" from the server + @Deprecated public static final int CHECK_INTERVAL_PING = -3; // Push-Hold indicates an EAS push or ping Mailbox shouldn't sync just yet + @Deprecated public static final int CHECK_INTERVAL_PUSH_HOLD = -4; // Sentinel for PARENT_KEY. Use NO_MAILBOX for toplevel mailboxes (i.e. no parents). diff --git a/src/com/android/email/activity/setup/MailboxSettings.java b/src/com/android/email/activity/setup/MailboxSettings.java index 08aab2780..1301a54f7 100644 --- a/src/com/android/email/activity/setup/MailboxSettings.java +++ b/src/com/android/email/activity/setup/MailboxSettings.java @@ -269,11 +269,6 @@ public class MailboxSettings extends PreferenceActivity { syncInterval = mMailbox.mSyncInterval; } } - // In the case of the internal push states, use "push" - if (syncInterval == Mailbox.CHECK_INTERVAL_PING || - syncInterval == Mailbox.CHECK_INTERVAL_PUSH_HOLD) { - syncInterval = Mailbox.CHECK_INTERVAL_PUSH; - } return syncInterval; }