commit bb7a04baeeecfb501e1e217723357baa745d14be
author Marc Blank <mblank@google.com> Wed Oct 27 09:16:42 2010 -0700
committer Marc Blank <mblank@google.com> Wed Oct 27 09:32:59 2010 -0700
tree df2bf195e43c24269e0ce7abf5e9407b19fcffca
parent 6dafe9ef3709e97705a2837507bc0d92e6b4eba2

Correct strict-mode fix CL

Change-Id: I233b77ec02d0b9519b4dba57458b1b5cf9a97561

src/com/android/exchange/ExchangeService.java

diff --git a/src/com/android/exchange/ExchangeService.java b/src/com/android/exchange/ExchangeService.java
index cfd1cf9..67cd337 100644
--- a/src/com/android/exchange/ExchangeService.java
+++ b/src/com/android/exchange/ExchangeService.java
@@ -1788,7 +1788,7 @@
         synchronized (sSyncLock) {
             // Start our thread...
             // See if there are any EAS accounts; otherwise, just go away
-            if (sServiceThread != null || sServiceThread.isAlive()) {
+            if (sServiceThread != null && sServiceThread.isAlive()) {
                 return;
             }
         }
@@ -1801,7 +1801,7 @@
                             WHERE_PROTOCOL_EAS, null) > 0) {
                         log(sServiceThread == null ? "Starting thread..."
                                 : "Restarting thread...");
-                        sServiceThread = new Thread(this, "ExchangeService");
+                        sServiceThread = new Thread(service, "ExchangeService");
                         INSTANCE = service;
                         sServiceThread.start();
                     }