am e7ebb5de: Remove references to deprecated sync states.

* commit 'e7ebb5de04e2419763459883f37f45ee0d27e4c7':
  Remove references to deprecated sync states.
This commit is contained in:
Yu Ping Hu 2013-06-19 17:40:00 -07:00 committed by Android Git Automerger
commit a0e603187a
2 changed files with 2 additions and 5 deletions

View File

@ -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).

View File

@ -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;
}