Merging upstream version 127.0.

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

3 files changed, 12 insertions, 22 deletions

diff --git a/toolkit/components/telemetry/docs/data/environment.rst b/toolkit/components/telemetry/docs/data/environment.rst
index 9e966fe707..6b0649bda7 100644
--- a/toolkit/components/telemetry/docs/data/environment.rst
+++ b/toolkit/components/telemetry/docs/data/environment.rst
@@ -104,6 +104,7 @@ Structure:
         creationDate: <integer>, // integer days since UNIX epoch, e.g. 16446
         resetDate: <integer>, // integer days since UNIX epoch, e.g. 16446 - optional
         firstUseDate: <integer>, // integer days since UNIX epoch, e.g. 16446 - optional
+        recoveredFromBackup: <integer>, // integer days since UNIX epoch, e.g. 16446 - optional
       },
       partner: { // This section may not be immediately available on startup
         distributionId: <string>, // pref "distribution.id", null on failure
@@ -281,7 +282,7 @@ Structure:
             hasBinaryComponents: <bool>,
             installDay: <number>, // days since UNIX epoch, 0 on failure
             updateDay: <number>, // days since UNIX epoch, 0 on failure
-            signedState: <integer>, // whether the add-on is signed by AMO, only present for extensions
+            signedState: <integer>, // whether the add-on is signed by AMO
             signedTypes: <string>, // JSON-stringified array of signature types found (see nsIAppSignatureInfo's SignatureAlgorithm enum)
             isSystem: <bool>, // true if this is a System Add-on
             isWebExtension: <bool>, // true if this is a WebExtension
@@ -302,6 +303,8 @@ Structure:
           hasBinaryComponents: <bool>
           installDay: <number>, // days since UNIX epoch, 0 on failure
           updateDay: <number>, // days since UNIX epoch, 0 on failure
+          signedState: <integer>, // whether the add-on is signed by AMO
+          signedTypes: <string>, // JSON-stringified array of signature types found (see nsIAppSignatureInfo's SignatureAlgorithm enum)
         },
         activeGMPlugins: {
             <gmp id>: {
@@ -547,6 +550,13 @@ The time of the first use of profile. If this is an old profile where we can't
 determine this this field will not be present.
 It's read from a file-stored timestamp from the client's profile directory.
 
+recoveredFromBackup
+~~~~~~~~~~~~~~~~~~~
+
+The time that this profile was recovered from a backup. If the profile was never
+recovered from a backup, this field will not be present.
+It's read from a file-stored timestamp from the client's profile directory.
+
 partner
 -------
 
diff --git a/toolkit/components/telemetry/docs/internals/preferences.rst b/toolkit/components/telemetry/docs/internals/preferences.rst
index 0c63ae031d..1ce8647322 100644
--- a/toolkit/components/telemetry/docs/internals/preferences.rst
+++ b/toolkit/components/telemetry/docs/internals/preferences.rst
@@ -202,26 +202,6 @@ Data-choices notification
 
   This is the only channel-specific version that we currently use for the minimum policy version.
 
-GeckoView
----------
-
-``toolkit.telemetry.geckoview.streaming``
-
-   Whether the GeckoView mode we're running in is the variety that uses the :doc:`GeckoView Streaming Telemetry API <../internals/geckoview-streaming>` or not.
-   Defaults to false.
-
-``toolkit.telemetry.geckoview.batchDurationMS``
-
-   The duration in milliseconds over which :doc:`GeckoView Streaming Telemetry <../internals/geckoview-streaming>` will batch accumulations before passing it on to its delegate.
-   Defaults to 5000.
-
-``toolkit.telemetry.geckoview.maxBatchStalenessMS``
-
-   The maximum time (in milliseconds) between flushes of the
-   :doc:`GeckoView Streaming Telemetry <../internals/geckoview-streaming>`
-   batch to its delegate.
-   Defaults to 60000.
-
 Testing
 -------
 
diff --git a/toolkit/components/telemetry/docs/internals/review.rst b/toolkit/components/telemetry/docs/internals/review.rst
index 80a3bd57de..d38bcfcc3b 100644
--- a/toolkit/components/telemetry/docs/internals/review.rst
+++ b/toolkit/components/telemetry/docs/internals/review.rst
@@ -67,7 +67,7 @@ Considerations for all changes
 - Does this affect products more broadly than expected?
 
   - Consider all our platforms: Windows, Mac, Linux, Android.
-  - Consider all our products: Firefox, Fennec, GeckoView, Glean.
+  - Consider all our products: Firefox, Fenix, Glean.
 
 - Does this fall afoul of common architectural failures?