commit 5550c7f729db4e1728b53a1d8a73083e756f3805
author Alon Albert <aalbert@google.com> Tue Sep 24 11:25:12 2013 -0700
committer Alon Albert <aalbert@google.com> Wed Sep 25 14:59:52 2013 -0700
tree 6ad6c40e654a8439facb7e9061e0c896202036b5
parent cae923d53ae81d133b14ff3af556541f209c1480

Abort Ping Thread on Destroy

Bug: 10855683
Change-Id: I01939c16c091ed1ebcf9a1c9a77524c3c40cf8ab

src/com/android/exchange/service/EmailSyncAdapterService.java

diff --git a/src/com/android/exchange/service/EmailSyncAdapterService.java b/src/com/android/exchange/service/EmailSyncAdapterService.java
index 964755c..70e91a9 100644
--- a/src/com/android/exchange/service/EmailSyncAdapterService.java
+++ b/src/com/android/exchange/service/EmailSyncAdapterService.java
@@ -467,6 +467,7 @@
 
     @Override
     public void onCreate() {
+        LogUtils.i(TAG, "onCreate()");
         super.onCreate();
         // Restart push for all accounts that need it.
         new RestartPingsTask(getContentResolver(), mSyncHandlerMap).executeOnExecutor(
@@ -474,6 +475,17 @@
     }
 
     @Override
+    public void onDestroy() {
+        LogUtils.i(TAG, "onDestroy()");
+        super.onDestroy();
+        for (PingTask task : mSyncHandlerMap.mPingHandlers.values()) {
+            if (task != null) {
+                task.stop();
+            }
+        }
+    }
+
+    @Override
     public IBinder onBind(Intent intent) {
         if (intent.getAction().equals(Eas.EXCHANGE_SERVICE_INTENT_ACTION)) {
             return mBinder;