commit a2ca28d7457866f9e25aea0295807815dfae9d96
author Johan Redestig <johan.redestig@sonymobile.com> Thu Jun 11 12:34:42 2015 +0200
committer Martin Hibdon <mhibdon@google.com> Tue Jun 16 13:35:24 2015 -0700
tree 0df456af8d843342a5ec2c596f80c66c60bd2f02
parent 3368bd8d8ae2cb3a8543adcfec2780a28cb552a3

Fix infinite loop in AttachmentService

If Attachment.restoreAttachmentWithId fails in processQueue the
AttachmentService would end up in an infinite loop with the
following logs:

  ...
  06-10 18:19:20.678  2369 17043 W AttachmentService: \
  Could not restore attachment #776
  06-10 18:19:20.680  2369 17043 W AttachmentService: \
  Could not restore attachment #776
  06-10 18:19:20.681  2369 17043 W AttachmentService: \
  Could not restore attachment #776
  06-10 18:19:20.690  2369 17043 W AttachmentService: \
  Could not restore attachment #776
  ....

With this fix processQueue instead skips to the next
attachment, which probably was the original intent
of the code.

Change-Id: Iadea75387a6f2f5e4cfedf429ab2a42732f2c36c

provider_src/com/android/email/service/AttachmentService.java

diff --git a/provider_src/com/android/email/service/AttachmentService.java b/provider_src/com/android/email/service/AttachmentService.java
index 2067669..6321049 100644
--- a/provider_src/com/android/email/service/AttachmentService.java
+++ b/provider_src/com/android/email/service/AttachmentService.java
@@ -847,10 +847,10 @@
             final Attachment attachment = Attachment.restoreAttachmentWithId(this, id);
             if (attachment == null) {
                 LogUtils.w(LOG_TAG, "Could not restore attachment #%d", id);
-                continue;
+            } else {
+                attachment.mFlags = (int) flags;
+                onChange(this, attachment);
             }
-            attachment.mFlags = (int) flags;
-            onChange(this, attachment);
             change = sAttachmentChangedQueue.poll();
         }