commit 3a4131f0a205ae151fc83c75f1faf7ea90813026
author Marc Blank <mblank@google.com> Fri Mar 04 17:59:34 2011 -0800
committer Marc Blank <mblank@google.com> Sat Mar 05 17:47:33 2011 -0800
tree 6a133e721fd968c201423a8ced230e3569332311
parent d39b429be18b592ab45b4b4396ebfe42c9ea4d6a

Fix potential deadlock in Exchange startup/shutdown code

* Move onCreate() and onDestroy() work out of UI thread

Bug: 3512859
Change-Id: Iad46cc8ce11c842bb23a9bf54cdae1c447b9e7e6

src/com/android/exchange/ExchangeService.java

diff --git a/src/com/android/exchange/ExchangeService.java b/src/com/android/exchange/ExchangeService.java
index 0697ab9..e59b6c9 100644
--- a/src/com/android/exchange/ExchangeService.java
+++ b/src/com/android/exchange/ExchangeService.java
@@ -1716,15 +1716,21 @@
      */
     @Override
     public void onCreate() {
-        synchronized (sSyncLock) {
-            alwaysLog("!!! EAS ExchangeService, onCreate");
-            // Try to start up properly; we might be coming back from a crash that the Email
-            // application isn't aware of.
-            startService(new Intent(EmailServiceProxy.EXCHANGE_INTENT));
-            if (sStop) {
-                return;
-            }
-        }
+        Utility.runAsync(new Runnable() {
+            @Override
+            public void run() {
+                // Quick checks first, before getting the lock
+                if (sStartingUp) return;
+                synchronized (sSyncLock) {
+                    alwaysLog("!!! EAS ExchangeService, onCreate");
+                    // Try to start up properly; we might be coming back from a crash that the Email
+                    // application isn't aware of.
+                    startService(new Intent(EmailServiceProxy.EXCHANGE_INTENT));
+                    if (sStop) {
+                        return;
+                    }
+                }
+            }});
     }
 
     @Override
@@ -1800,13 +1806,20 @@
     @Override
     public void onDestroy() {
         log("!!! EAS ExchangeService, onDestroy");
-        synchronized(sSyncLock) {
-            // Stop the sync manager thread and return
-            if (sServiceThread != null) {
-                sStop = true;
-                sServiceThread.interrupt();
-            }
-        }
+        // Handle shutting down off the UI thread
+        Utility.runAsync(new Runnable() {
+            @Override
+            public void run() {
+                // Quick checks first, before getting the lock
+                if (INSTANCE == null || sServiceThread == null) return;
+                synchronized(sSyncLock) {
+                    // Stop the sync manager thread and return
+                    if (sServiceThread != null) {
+                        sStop = true;
+                        sServiceThread.interrupt();
+                    }
+                }
+            }});
     }
 
     void maybeStartExchangeServiceThread() {