Merging upstream version 125.0.1.

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

1 files changed, 53 insertions, 1 deletions

diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebExtension.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebExtension.java
index d553a1aa3f..1caa5508ed 100644
--- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebExtension.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebExtension.java
@@ -1688,7 +1688,7 @@ public class WebExtension {
    * in Firefox. </a>
    */
   public static class SignedStateFlags {
-    // Keep in sync with AddonManager.jsm
+    // Keep in sync with AddonManager.sys.mjs
     /**
      * This extension may be signed but by a certificate that doesn't chain to our our trusted
      * certificate.
@@ -1820,6 +1820,50 @@ public class WebExtension {
     public final @NonNull String[] permissions;
 
     /**
+     * API <a
+     * href="https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/manifest.json/optional_permissions">optional
+     * permissions</a> requested or granted to this extension.
+     *
+     * <p>Permission identifiers match entries in the manifest, see <a
+     * href="https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/manifest.json/permissions#API_permissions">
+     * API permissions </a>.
+     */
+    public final @NonNull String[] optionalPermissions;
+
+    /**
+     * API <a
+     * href="https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/manifest.json/optional_permissions">optional
+     * permissions</a> granted to this extension.
+     *
+     * <p>Permission identifiers match entries in the manifest, see <a
+     * href="https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/manifest.json/permissions#API_permissions">
+     * API permissions </a>.
+     */
+    public final @NonNull String[] grantedOptionalPermissions;
+
+    /**
+     * API <a
+     * href="https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/manifest.json/optional_permissions">
+     * optional origin permissions</a> requested or granted to this extension.
+     *
+     * <p>Permission identifiers match entries in the manifest, see <a
+     * href="https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/manifest.json/permissions#API_permissions">
+     * API permissions </a>.
+     */
+    public final @NonNull String[] optionalOrigins;
+
+    /**
+     * API <a
+     * href="https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/manifest.json/optional_permissions">
+     * optional origin permissions</a> granted to this extension.
+     *
+     * <p>Permission identifiers match entries in the manifest, see <a
+     * href="https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/manifest.json/permissions#API_permissions">
+     * API permissions </a>.
+     */
+    public final @NonNull String[] grantedOptionalOrigins;
+
+    /**
      * Host permissions requested or granted to this extension.
      *
      * <p>See <a
@@ -1999,6 +2043,10 @@ public class WebExtension {
     protected MetaData() {
       icon = null;
       permissions = null;
+      optionalPermissions = null;
+      grantedOptionalPermissions = null;
+      grantedOptionalOrigins = null;
+      optionalOrigins = null;
       origins = null;
       name = null;
       description = null;
@@ -2029,6 +2077,10 @@ public class WebExtension {
     /* package */ MetaData(final GeckoBundle bundle) {
       // We only expose permissions that the embedder should prompt for
       permissions = bundle.getStringArray("promptPermissions");
+      optionalPermissions = bundle.getStringArray("optionalPermissions");
+      grantedOptionalPermissions = bundle.getStringArray("grantedOptionalPermissions");
+      optionalOrigins = bundle.getStringArray("optionalOrigins");
+      grantedOptionalOrigins = bundle.getStringArray("grantedOptionalOrigins");
       origins = bundle.getStringArray("origins");
       description = bundle.getString("description");
       version = bundle.getString("version");