commit 71927d3ae01d462fe2dbc9786a256d6b58ab38de
parent 280ebbf4271081b8c0112f0940501fb668690605
Author: Ted Campbell <tcampbell@mozilla.com>
Date: Tue, 9 Dec 2025 18:47:38 +0000
Bug 2004854 - Remove deprecated GeckoView APIs for v148 r=geckoview-reviewers,geckoview-api-reviewers,nalexander
Differential Revision: https://phabricator.services.mozilla.com/D275548
Diffstat:
3 files changed, 2 insertions(+), 52 deletions(-)
diff --git a/mobile/android/geckoview/api.txt b/mobile/android/geckoview/api.txt
@@ -53,7 +53,6 @@ import java.lang.Boolean;
import java.lang.CharSequence;
import java.lang.Class;
import java.lang.Comparable;
-import java.lang.Deprecated;
import java.lang.Double;
import java.lang.Exception;
import java.lang.Float;
@@ -91,7 +90,6 @@ import org.mozilla.geckoview.ContentBlocking;
import org.mozilla.geckoview.ContentBlockingController;
import org.mozilla.geckoview.CrashHandler;
import org.mozilla.geckoview.CrashPullController;
-import org.mozilla.geckoview.DeprecationSchedule;
import org.mozilla.geckoview.ExperimentDelegate;
import org.mozilla.geckoview.GeckoDisplay;
import org.mozilla.geckoview.GeckoPreferenceController;
@@ -1043,7 +1041,6 @@ package org.mozilla.geckoview {
method @NonNull public int getLargeKeepaliveFactor();
method @Nullable public Boolean getLnaBlockTrackers();
method @Nullable public Boolean getLnaBlocking();
- method @Deprecated @DeprecationSchedule(id="deprecated-lna-api",version=148) public boolean getLnaBlockingEnabled();
method @Nullable public Boolean getLnaEnabled();
method @Nullable public String[] getLocales();
method public boolean getLoginAutofillEnabled();
@@ -1101,7 +1098,6 @@ package org.mozilla.geckoview {
method @NonNull public GeckoRuntimeSettings setLargeKeepaliveFactor(int);
method @NonNull public GeckoRuntimeSettings setLnaBlockTrackers(boolean);
method @NonNull public GeckoRuntimeSettings setLnaBlocking(boolean);
- method @Deprecated @DeprecationSchedule(id="deprecated-lna-api",version=148) @NonNull public GeckoRuntimeSettings setLnaBlockingEnabled(boolean);
method @NonNull public GeckoRuntimeSettings setLnaEnabled(boolean);
method public void setLocales(@Nullable String[]);
method @NonNull public GeckoRuntimeSettings setLoginAutofillEnabled(boolean);
@@ -1180,7 +1176,6 @@ package org.mozilla.geckoview {
method @NonNull public GeckoRuntimeSettings.Builder screenSizeOverride(int, int);
method @NonNull public GeckoRuntimeSettings.Builder setLnaBlockTrackers(@NonNull Boolean);
method @NonNull public GeckoRuntimeSettings.Builder setLnaBlocking(@NonNull Boolean);
- method @Deprecated @DeprecationSchedule(id="deprecated-lna-api",version=148) @NonNull public GeckoRuntimeSettings.Builder setLnaBlockingEnabled(@NonNull Boolean);
method @NonNull public GeckoRuntimeSettings.Builder setLnaEnabled(@NonNull Boolean);
method @NonNull public GeckoRuntimeSettings.Builder setSameDocumentNavigationOverridesLoadType(boolean);
method @NonNull public GeckoRuntimeSettings.Builder setSameDocumentNavigationOverridesLoadTypeForceDisable(@NonNull String);
diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java
@@ -570,22 +570,6 @@ public final class GeckoRuntimeSettings extends RuntimeSettings {
}
/**
- * Sets whether or not local network access (LNA) blocking is enabled
- *
- * @deprecated This API is deprecated and may not work as expected. Please use {@link
- * #setLnaEnabled(Boolean)}, {@link #setLnaBlocking(Boolean)} and {@link
- * #setLnaBlockTrackers(Boolean)}} for more fine-grained control.
- * @param enabled flag indicating whether or not local network access (LNA) blocking is enabled
- * @return The builder instance
- */
- @Deprecated
- @DeprecationSchedule(id = "deprecated-lna-api", version = 148)
- public @NonNull Builder setLnaBlockingEnabled(@NonNull final Boolean enabled) {
- getSettings().setLnaBlockingEnabled(enabled);
- return this;
- }
-
- /**
* Sets whether or not the request blocking feature for Local Network / Device Access blocking
* is enabled
*
@@ -2142,36 +2126,6 @@ public final class GeckoRuntimeSettings extends RuntimeSettings {
}
/**
- * Sets whether or not local network access (LNA) blocking is enabled
- *
- * @param enabled flag indicating whether or not local network access blocking is enabled
- * @return The updated instance of {@link GeckoRuntimeSettings}
- * @deprecated This API is deprecated and does not work as expected. Please use {@link
- * #setLnaEnabled(boolean)}, {@link #setLnaBlocking(boolean)} and {@link
- * #setLnaBlockTrackers(boolean)}} for more fine-grained control.
- */
- @Deprecated
- @DeprecationSchedule(id = "deprecated-lna-api", version = 148)
- public @NonNull GeckoRuntimeSettings setLnaBlockingEnabled(final boolean enabled) {
- mLnaBlocking.commit(enabled);
- return this;
- }
-
- /**
- * Gets whether or not local network access (LNA) blocking is enabled
- *
- * @return Boolean indicating whether LNA blocking is enabled or not.
- * @deprecated This API is deprecated and does not work as expected. Use {@link #getLnaEnabled()},
- * {@link #getLnaBlocking()} and {@link #getLnaBlockTrackers()} for more fine-grained control.
- */
- @Deprecated
- @DeprecationSchedule(id = "deprecated-lna-api", version = 148)
- public boolean getLnaBlockingEnabled() {
- final Boolean lnaBlocking = mLnaBlocking.get();
- return lnaBlocking != null ? lnaBlocking : false;
- }
-
- /**
* Set whether and where insecure (non-HTTPS) connections are allowed.
*
* @param level One of the {@link GeckoRuntimeSettings#ALLOW_ALL HttpsOnlyMode} constants.
diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/doc-files/CHANGELOG.md b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/doc-files/CHANGELOG.md
@@ -16,6 +16,7 @@ exclude: true
## v148
- Introduce the harmful-addon URL-Classifier feature
- [`HARMFULADDON`][148.1]
+- ⚠️ Remove deprecated `GeckoRuntimeSettings.Builder.setLnaBlockingEnabled`, `GeckoRuntimeSettings.setLnaBlockingEnabled` and `GeckoRuntimeSettings.getLnaBlockingEnabled` APIs. Alternatives were introduced in v147.
[148.1]: {{javadoc_uri}}/ContentBlocking.SafeBrowsing.html#HARMFULADDON
@@ -1883,4 +1884,4 @@ to allow adding gecko profiler markers.
[65.24]: {{javadoc_uri}}/CrashReporter.html#sendCrashReport(android.content.Context,android.os.Bundle,java.lang.String)
[65.25]: {{javadoc_uri}}/GeckoResult.html
-[api-version]: 06cc6fd405532b3517d633ecee744d74223c6bc2
+[api-version]: d32e6e204686a16db974861a7ce2ed06bc8147fc
