commit a566198cf9d66c63f89c2af3977cc426c94e7406
author Alon Albert <aalbert@google.com> Wed Sep 25 22:06:55 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 25 22:06:55 2013 +0000
tree fd77f28aa7edd44549e5fb01f73fe8ec810d6bc5
parent d9699fca56f5fd55cca392ace7567d1866cd5c58
parent 5550c7f729db4e1728b53a1d8a73083e756f3805

Merge "Abort Ping Thread on Destroy" into jb-ub-mail-ur10

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 01a4074..e8a5b05 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();
         startService(new Intent(this, EmailSyncAdapterService.class));
         // Restart push for all accounts that need it.
@@ -475,6 +476,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;