From 7c8e16a52a7b330906fe2cd3ee201d7b6b731425 Mon Sep 17 00:00:00 2001
From: Margaret Leibovic <margaret.leibovic@gmail.com>
Date: Sun, 22 Feb 2015 17:18:39 -0800
Subject: [PATCH] Bug 1130834 - Explictly cancel ongoing download notifications
 instead of trying to update them to be non-ongoing. r=wesj

---
 mobile/android/modules/DownloadNotifications.jsm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/mobile/android/modules/DownloadNotifications.jsm b/mobile/android/modules/DownloadNotifications.jsm
index f2fccefc676..f67f52c866d 100644
--- a/mobile/android/modules/DownloadNotifications.jsm
+++ b/mobile/android/modules/DownloadNotifications.jsm
@@ -219,6 +219,12 @@ DownloadNotification.prototype = {
     if (this._show) {
       if (!this.id) {
         this.id = Notifications.create(this.options);
+      } else if (!this.options.ongoing) {
+        // We need to explictly cancel ongoing notifications,
+        // since updating them to be non-ongoing doesn't seem
+        // to work. See bug 1130834.
+        Notifications.cancel(this.id);
+        this.id = Notifications.create(this.options);
       } else {
         Notifications.update(this.id, this.options);
       }