From e13ff84df7877e447a33136e328813b3ee0e5140 Mon Sep 17 00:00:00 2001
From: Marc Blank <mblank@google.com>
Date: Fri, 11 Sep 2009 16:28:33 -0700
Subject: [PATCH] Fix leaked intent receiver by using onStartCommand in
 SyncManager

Change-Id: I914c597aede6904a11a5d3119b3f7097e65b2fba
---
 src/com/android/exchange/SyncManager.java | 43 +++++++++++++----------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/src/com/android/exchange/SyncManager.java b/src/com/android/exchange/SyncManager.java
index c5e0513f1..30755f280 100644
--- a/src/com/android/exchange/SyncManager.java
+++ b/src/com/android/exchange/SyncManager.java
@@ -671,7 +671,7 @@ public class SyncManager extends Service implements Runnable {
         if (INSTANCE != null) {
             Log.d(TAG, "onCreate called on running SyncManager");
         } else {
-            Log.d(TAG, "!!! EAS SyncManager started");
+            Log.d(TAG, "!!! EAS SyncManager, onCreate");
             INSTANCE = this;
             try {
                 sDeviceId = getDeviceId();
@@ -687,12 +687,34 @@ public class SyncManager extends Service implements Runnable {
             mMessageObserver = new MessageObserver(mHandler);
             mSyncStatusObserver = new EasSyncStatusObserver();
         }
+    }
 
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        Log.d(TAG, "!!! EAS SyncManager, onStartCommand");
         maybeStartSyncManagerThread();
         if (sServiceThread == null) {
-            Log.d(TAG, "!!! EAS SyncManager stopping self");
+            Log.d(TAG, "!!! EAS SyncManager, stopping self");
             stopSelf();
         }
+        return Service.START_REDELIVER_INTENT;
+    }
+
+    @Override
+    public void onDestroy() {
+        Log.d(TAG, "!!! EAS SyncManager, onDestroy");
+    }
+
+    void maybeStartSyncManagerThread() {
+        // Start our thread...
+        // See if there are any EAS accounts; otherwise, just go away
+        if (EmailContent.count(this, HostAuth.CONTENT_URI, WHERE_PROTOCOL_EAS, null) > 0) {
+            if (sServiceThread == null || !sServiceThread.isAlive()) {
+                log(sServiceThread == null ? "Starting thread..." : "Restarting thread...");
+                sServiceThread = new Thread(this, "SyncManager");
+                sServiceThread.start();
+            }
+        }
     }
 
     static public ConnPerRoute sConnPerRoute = new ConnPerRoute() {
@@ -741,23 +763,6 @@ public class SyncManager extends Service implements Runnable {
         return sClientConnectionManager;
     }
 
-    @Override
-    public void onDestroy() {
-        log("!!! EAS SyncManager destroyed");
-    }
-
-    void maybeStartSyncManagerThread() {
-        // Start our thread...
-        // See if there are any EAS accounts; otherwise, just go away
-        if (EmailContent.count(this, HostAuth.CONTENT_URI, WHERE_PROTOCOL_EAS, null) > 0) {
-            if (sServiceThread == null || !sServiceThread.isAlive()) {
-                log(sServiceThread == null ? "Starting thread..." : "Restarting thread...");
-                sServiceThread = new Thread(this, "SyncManager");
-                sServiceThread.start();
-            }
-        }
-    }
-
     static public void reloadFolderList(Context context, long accountId, boolean force) {
         if (INSTANCE == null) return;
         Cursor c = context.getContentResolver().query(Mailbox.CONTENT_URI,