commit 7e7d8f3d22eded30a72391ede85e511539ae2a26
author Marc Blank <mblank@google.com> Sat Oct 10 22:59:05 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Sat Oct 10 22:59:05 2009 -0700
tree c1c1b9b50a9ba2257f8ad04bad06486cde77d8d5
parent 11155d16120c701df819cbf87ac9e4bac034a0b6
parent 940d64c988589390353875bf1351818bd628cfb7

am ea878be1: Make sure we hold WakeLock during mail sending (fixes #2180551)

Merge commit 'ea878be11729cd793d9183fc264118241cd5a5b6' into eclair-mr2

* commit 'ea878be11729cd793d9183fc264118241cd5a5b6':
  Make sure we hold WakeLock during mail sending (fixes #2180551)

src/com/android/exchange/EasSyncService.java

diff --git a/src/com/android/exchange/EasSyncService.java b/src/com/android/exchange/EasSyncService.java
index 3b2a8a5..1b24799 100644
--- a/src/com/android/exchange/EasSyncService.java
+++ b/src/com/android/exchange/EasSyncService.java
@@ -414,6 +414,7 @@
     protected HttpResponse sendHttpClientPost(String cmd, HttpEntity entity, int timeout)
             throws IOException {
         HttpClient client = getHttpClient(timeout);
+        boolean sleepAllowed = cmd.equals(PING_COMMAND);
 
         // Split the mail sending commands
         String extra = null;
@@ -438,13 +439,17 @@
         method.setEntity(entity);
         synchronized(getSynchronizer()) {
             mPendingPost = method;
-            SyncManager.runAsleep(mMailboxId, timeout+(10*SECONDS));
+            if (sleepAllowed) {
+                SyncManager.runAsleep(mMailboxId, timeout+(10*SECONDS));
+            }
         }
         try {
             return client.execute(method);
         } finally {
             synchronized(getSynchronizer()) {
-                SyncManager.runAwake(mMailboxId);
+                if (sleepAllowed) {
+                    SyncManager.runAwake(mMailboxId);
+                }
                 mPendingPost = null;
             }
         }