commit bec4d8def1b70a9b9eba4e7656f8ee68607206c2
author Android (Google) Code Review <android-gerrit@google.com> Thu Oct 01 00:32:49 2009 -0400
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 01 00:32:49 2009 -0400
tree 1edbca703d6b6d0bc69024366b328a1e9016b9ed
parent 53d033207e3fecaa4fa5a57354c61350e44bcfda
parent be7c5572473d81bb4fbbdb51f9b37ee504ccd3e7

Merge change Iee4f5e88 into eclair

* changes:
  use Events for birthdays

res/drawable-hdpi/fasttrack_presence_bg.png

diff --git a/res/drawable-hdpi/fasttrack_presence_bg.png b/res/drawable-hdpi/fasttrack_presence_bg.png
deleted file mode 100644
index e8976cf..0000000
--- a/res/drawable-hdpi/fasttrack_presence_bg.png
+++ /dev/null
Binary files differ

res/drawable-mdpi/fasttrack_presence_bg.png

diff --git a/res/drawable-mdpi/fasttrack_presence_bg.png b/res/drawable-mdpi/fasttrack_presence_bg.png
deleted file mode 100644
index 3dbbae2..0000000
--- a/res/drawable-mdpi/fasttrack_presence_bg.png
+++ /dev/null
Binary files differ

src/com/android/exchange/SyncManager.java

diff --git a/src/com/android/exchange/SyncManager.java b/src/com/android/exchange/SyncManager.java
index 391e2f2..6aae771 100644
--- a/src/com/android/exchange/SyncManager.java
+++ b/src/com/android/exchange/SyncManager.java
@@ -1702,7 +1702,7 @@
         if (error != null) {
             if (error.fatal) {
                 return PING_STATUS_UNABLE;
-            } else {
+            } else if (error.holdEndTime > 0) {
                 return PING_STATUS_WAITING;
             }
         }