Merging upstream version 115.8.0esr.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 31 insertions, 10 deletions

diff --git a/toolkit/components/autocomplete/nsAutoCompleteController.cpp b/toolkit/components/autocomplete/nsAutoCompleteController.cpp
index dc9754997b..a10f4ee62f 100644
--- a/toolkit/components/autocomplete/nsAutoCompleteController.cpp
+++ b/toolkit/components/autocomplete/nsAutoCompleteController.cpp
@@ -499,17 +499,24 @@ nsAutoCompleteController::HandleKeyNavigation(uint32_t aKey, bool* _retval) {
         }
       }
 
-      nsAutoString oldSearchString;
-      uint16_t oldResult = 0;
-
       // Open the popup if there has been a previous non-errored search, or
       // else kick off a new search
-      if (!mResults.IsEmpty() &&
-          NS_SUCCEEDED(mResults[0]->GetSearchResult(&oldResult)) &&
-          oldResult != nsIAutoCompleteResult::RESULT_FAILURE &&
-          NS_SUCCEEDED(mResults[0]->GetSearchString(oldSearchString)) &&
-          oldSearchString.Equals(mSearchString,
-                                 nsCaseInsensitiveStringComparator)) {
+      bool hadPreviousSearch = false;
+      for (uint32_t i = 0; i < mResults.Length(); ++i) {
+        nsAutoString oldSearchString;
+        uint16_t oldResult = 0;
+        nsIAutoCompleteResult* oldResultObject = mResults[i];
+        if (oldResultObject &&
+            NS_SUCCEEDED(oldResultObject->GetSearchResult(&oldResult)) &&
+            oldResult != nsIAutoCompleteResult::RESULT_FAILURE &&
+            NS_SUCCEEDED(oldResultObject->GetSearchString(oldSearchString)) &&
+            oldSearchString.Equals(mSearchString,
+                                   nsCaseInsensitiveStringComparator)) {
+          hadPreviousSearch = true;
+          break;
+        }
+      }
+      if (hadPreviousSearch) {
         if (mMatchCount) {
           OpenPopup();
         }
diff --git a/toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/browser.ini b/toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/browser.ini
index 8cc00b7d18..4630a86977 100644
--- a/toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/browser.ini
+++ b/toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/browser.ini
@@ -20,6 +20,8 @@ support-files =
 skip-if = os != "win"
 [browser_sma_show_firefox_accounts.js]
 [browser_sma_show_migration_wizard.js]
+skip-if =
+  os == "mac" && os_version == "10.15" && debug # Bug 1837646
 [browser_sma.js]
 [browser_sma_docs.js]
 [browser_sma_accept_doh.js]
diff --git a/toolkit/components/telemetry/app/TelemetryEnvironment.sys.mjs b/toolkit/components/telemetry/app/TelemetryEnvironment.sys.mjs
index 26c4847770..c5d99acf60 100644
--- a/toolkit/components/telemetry/app/TelemetryEnvironment.sys.mjs
+++ b/toolkit/components/telemetry/app/TelemetryEnvironment.sys.mjs
@@ -1907,6 +1907,13 @@ EnvironmentCache.prototype = {
       this._osData.kernelVersion = forceToStringOrNull(
         getSysinfoProperty("kernel_version", null)
       );
+    } else if (AppConstants.platform == "linux") {
+      this._osData.distro = forceToStringOrNull(
+        getSysinfoProperty("distro", null)
+      );
+      this._osData.distroVersion = forceToStringOrNull(
+        getSysinfoProperty("distroVersion", null)
+      );
     } else if (AppConstants.platform === "win") {
       // The path to the "UBR" key, queried to get additional version details on Windows.
       const WINDOWS_UBR_KEY_PATH =
diff --git a/toolkit/components/telemetry/docs/data/environment.rst b/toolkit/components/telemetry/docs/data/environment.rst
index b61c2a35e4..8b7c38ef89 100644
--- a/toolkit/components/telemetry/docs/data/environment.rst
+++ b/toolkit/components/telemetry/docs/data/environment.rst
@@ -160,7 +160,9 @@ Structure:
             installYear: <number>, // windows only or null on failure
             locale: <string>, // "en" or null on failure
             hasPrefetch: <bool>, // windows only, or null on failure
-            hasSuperfetch: <bool>, // windows only, or nul on failure
+            hasSuperfetch: <bool>, // windows only, or null on failure
+            distro: <string>, // linux only, or null on failure
+            distroVersion: <string>, // linux only, or null on failure
         },
         hdd: {
           profile: { // hdd where the profile folder is located
diff --git a/toolkit/components/telemetry/tests/unit/TelemetryEnvironmentTesting.sys.mjs b/toolkit/components/telemetry/tests/unit/TelemetryEnvironmentTesting.sys.mjs
index da12fb74f5..3d07ae3e84 100644
--- a/toolkit/components/telemetry/tests/unit/TelemetryEnvironmentTesting.sys.mjs
+++ b/toolkit/components/telemetry/tests/unit/TelemetryEnvironmentTesting.sys.mjs
@@ -605,6 +605,9 @@ export var TelemetryEnvironmentTesting = {
       }
     } else if (gIsAndroid) {
       lazy.Assert.ok(this.checkNullOrString(osData.kernelVersion));
+    } else if (gIsLinux) {
+      lazy.Assert.ok(this.checkNullOrString(osData.distro));
+      lazy.Assert.ok(this.checkNullOrString(osData.distroVersion));
     }
 
     for (let disk of EXPECTED_HDD_FIELDS) {