commit ec0bb58b9a9ef98bed2e8139c366792b48e500ae
author Yu Ping Hu <yph@google.com> Mon Oct 14 21:51:14 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 14 21:51:14 2013 +0000
tree b7f29b21f8dc0af2a2d999973d102d7aed5667ad
parent efd835aceaa58ceefa29057b21644653bff70ae3
parent 1004d74f2c2c8085d793bf8f0118d80fe934e830

Merge "Fix folder list loading." into jb-ub-mail-ur10

src/com/android/email/service/AttachmentDownloadService.java

diff --git a/src/com/android/email/service/AttachmentDownloadService.java b/src/com/android/email/service/AttachmentDownloadService.java
index 1e65f30..357e9e3 100644
--- a/src/com/android/email/service/AttachmentDownloadService.java
+++ b/src/com/android/email/service/AttachmentDownloadService.java
@@ -921,7 +921,15 @@
         // Loop until stopped, with a 30 minute wait loop
         while (!mStop) {
             // Here's where we run our attachment loading logic...
-            mConnectivityManager.waitForConnectivity();
+            // Make a local copy of the variable so we don't null-crash on service shutdown
+            final EmailConnectivityManager ecm = mConnectivityManager;
+            if (ecm != null) {
+                ecm.waitForConnectivity();
+            }
+            if (mStop) {
+                // We might be bailing out here due to the service shutting down
+                break;
+            }
             mDownloadSet.processQueue();
             if (mDownloadSet.isEmpty()) {
                 LogUtils.d(TAG, "*** All done; shutting down service");
@@ -938,8 +946,10 @@
         }
 
         // Unregister now that we're done
-        if (mConnectivityManager != null) {
-            mConnectivityManager.unregister();
+        // Make a local copy of the variable so we don't null-crash on service shutdown
+        final EmailConnectivityManager ecm = mConnectivityManager;
+        if (ecm != null) {
+            ecm.unregister();
         }
     }
 
@@ -975,6 +985,7 @@
         }
         if (mConnectivityManager != null) {
             mConnectivityManager.unregister();
+            mConnectivityManager.stopWait();
             mConnectivityManager = null;
         }
     }