Send "completed" broadcast if download cancelled.

When a download is deleted, we may not have an active thread, so
always send the broadcast from the provider.  If an active thread
encounters a deleted download, skip sending the broadcast twice.

Change-Id: If8d5b99a1b7232bb64c6d11f22fdb4f5d6dbbfec
Test: none
Bug: 30883889

1 files changed, 5 insertions, 1 deletions

diff --git a/src/com/android/providers/downloads/DownloadThread.java b/src/com/android/providers/downloads/DownloadThread.java
index 40194038..33436f57 100644
--- a/src/com/android/providers/downloads/DownloadThread.java
+++ b/src/com/android/providers/downloads/DownloadThread.java
@@ -382,7 +382,11 @@ public class DownloadThread extends Thread {
         }
 
         if (Downloads.Impl.isStatusCompleted(mInfoDelta.mStatus)) {
-            mInfo.sendIntentIfRequested();
+            // If download was canceled, we already sent requested intent when
+            // deleted in the provider
+            if (mInfoDelta.mStatus != STATUS_CANCELED) {
+                mInfo.sendIntentIfRequested();
+            }
             if (mInfo.shouldScanFile(mInfoDelta.mStatus)) {
                 DownloadScanner.requestScanBlocking(mContext, mInfo.mId, mInfoDelta.mFileName,
                         mInfoDelta.mMimeType);