[*AM] Expand the list for excluding internally used IDs from being sent to AUS

2 files changed, 22 insertions, 4 deletions

diff --git a/toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm b/toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm
index 939e2e269..8d742ea42 100644
--- a/toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm
+++ b/toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm
@@ -766,8 +766,17 @@ this.AddonUpdateChecker = {
    *         down in-progress update requests
    */
   checkForUpdates: function AUC_checkForUpdates(aId, aUpdateKey, aUrl, aObserver) {
-    // Exclude default theme
-    if (aId != "{972ce4c6-7e08-4474-a285-3208198ce6fd}")
+    // Define an array of internally used IDs to NOT send to AUS such as the
+    // Default Theme. Please keep this list in sync with:
+    // toolkit/mozapps/webextensions/AddonUpdateChecker.jsm
+    let internalIDS = [
+      '{972ce4c6-7e08-4474-a285-3208198ce6fd}',
+      'modern@themes.mozilla.org'
+    ];
+    
+    // If the ID is not in the array then go ahead and query AUS
+    if (internalIDS.indexOf(aId) == -1) {
         return new UpdateParser(aId, aUpdateKey, aUrl, aObserver);
+    }
   }
 };
diff --git a/toolkit/mozapps/webextensions/internal/AddonUpdateChecker.jsm b/toolkit/mozapps/webextensions/internal/AddonUpdateChecker.jsm
index 918ba5328..bdd3a81e7 100644
--- a/toolkit/mozapps/webextensions/internal/AddonUpdateChecker.jsm
+++ b/toolkit/mozapps/webextensions/internal/AddonUpdateChecker.jsm
@@ -929,8 +929,17 @@ this.AddonUpdateChecker = {
    *         down in-progress update requests
    */
   checkForUpdates: function(aId, aUpdateKey, aUrl, aObserver) {
-    // Exclude default theme
-    if (aId != "{972ce4c6-7e08-4474-a285-3208198ce6fd}")
+    // Define an array of internally used IDs to NOT send to AUS such as the
+    // Default Theme. Please keep this list in sync with:
+    // toolkit/mozapps/extensions/AddonUpdateChecker.jsm
+    let internalIDS = [
+      '{972ce4c6-7e08-4474-a285-3208198ce6fd}',
+      'modern@themes.mozilla.org'
+    ];
+    
+    // If the ID is not in the array then go ahead and query AUS
+    if (internalIDS.indexOf(aId) == -1) {
         return new UpdateParser(aId, aUpdateKey, aUrl, aObserver);
+    }
   }
 };