diff --git a/mobile/android/geckoview/api.txt b/mobile/android/geckoview/api.txt index ac24821237e8..43cc52653ee4 100644 --- a/mobile/android/geckoview/api.txt +++ b/mobile/android/geckoview/api.txt @@ -458,7 +458,8 @@ package org.mozilla.geckoview { field public static final int LOADED_LEVEL_1_TRACKING_CONTENT = 8192; field public static final int LOADED_LEVEL_2_TRACKING_CONTENT = 1048576; field public static final int LOADED_SOCIALTRACKING_CONTENT = 131072; - field public static final int REPLACED_UNSAFE_CONTENT = 16; + field public static final int REPLACED_TRACKING_CONTENT = 16; + field @Deprecated public static final int REPLACED_UNSAFE_CONTENT = 16; } @Deprecated @AnyThread public class ContentBlockingController.ExceptionList { diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/ContentBlockingController.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/ContentBlockingController.java index dc5422258cb7..fd0e70a814b7 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/ContentBlockingController.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/ContentBlockingController.java @@ -413,9 +413,17 @@ public class ContentBlockingController { /** * Indicates that content that would have been blocked has instead been * replaced with a shim. + * @deprecated use {@link #REPLACED_TRACKING_CONTENT} instead. */ + @Deprecated public static final int REPLACED_UNSAFE_CONTENT = 0x00000010; + /** + * Indicates that content that would have been blocked has instead been + * replaced with a shim. + */ + public static final int REPLACED_TRACKING_CONTENT = 0x00000010; + protected Event() {} } 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 index eb1f5891d61a..82c5af8d2751 100644 --- 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 @@ -59,7 +59,7 @@ exclude: true ([bug 1650108]({{bugzilla}}1650108)) - ⚠️ Use AndroidX instead of the Android support library. For the public API this only changes the thread and nullable annotation types. -- Added [`REPLACED_UNSAFE_CONTENT`][82.6] to content blocking API to indicate when unsafe content is shimmed. +- Added [`REPLACED_TRACKING_CONTENT`][82.6] to content blocking API to indicate when unsafe content is shimmed. ([bug 1663756]({{bugzilla}}1663756)) [82.1]: {{javadoc_uri}}/GeckoSession.ContentDelegate.html#onExternalResponse-org.mozilla.geckoview.GeckoSession-org.mozilla.geckoview.GeckoSession.WebResponseInfo- @@ -67,7 +67,7 @@ exclude: true [82.3]: {{javadoc_uri}}/Image.html [82.4]: {{javadoc_uri}}/GeckoSession.PromptDelegate.RepostConfirmPrompt.html [82.5]: {{javadoc_uri}}/GeckoSession.html#restoreState-org.mozilla.geckoview.GeckoSession.SessionState- -[82.6]: {{javadoc_uri}}/ContentBlockingController.Event.html#REPLACED_UNSAFE_CONTENT +[82.6]: {{javadoc_uri}}/ContentBlockingController.Event.html#REPLACED_TRACKING_CONTENT ## v81 - Added `cookiePurging` to [`ContentBlocking.Settings.Builder`][81.1] and `getCookiePurging` and `setCookiePurging` @@ -826,4 +826,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]: b55b29412d4d11b9a62dfd71f60568d1286b1e7b +[api-version]: a2b63f41870a698bfe884cc415427dfb8c6fb471