Backed out changeset 624547a0b29c (bug 1649529) for linting failure on GeckoSession.java. CLOSED TREE

mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/BaseSessionTest.kt

@@ -107,8 +107,6 @@ open class BaseSessionTest(noErrorCollector: Boolean = false) {
     inline fun GeckoSession.toParcel(lambda: (Parcel) -> Unit) {
         val parcel = Parcel.obtain()
         try {
-            // Bug 1650108: Remove this
-            @Suppress("DEPRECATION")
             this.writeToParcel(parcel, 0)
 
             val pos = parcel.dataPosition()

mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/SessionLifecycleTest.kt

@@ -79,7 +79,6 @@ class SessionLifecycleTest : BaseSessionTest() {
         sessionRule.session.open()
     }
 
-    @Suppress("DEPRECATION")
     @Test fun readFromParcel() {
         val session = sessionRule.createOpenSession()
 
@@ -98,7 +97,6 @@ class SessionLifecycleTest : BaseSessionTest() {
         sessionRule.session.waitForPageStop()
     }
 
-    @Suppress("DEPRECATION")
     @Ignore //Disable test for frequent failures Bug 1532186
     @Test(expected = IllegalStateException::class)
     fun readFromParcel_throwOnAlreadyOpen() {
@@ -110,7 +108,6 @@ class SessionLifecycleTest : BaseSessionTest() {
         }
     }
 
-    @Suppress("DEPRECATION")
     @Test fun readFromParcel_canLoadPageAfterRead() {
         var newSession: GeckoSession? = null
 
@@ -122,7 +119,6 @@ class SessionLifecycleTest : BaseSessionTest() {
         newSession!!.waitForPageStop()
     }
 
-    @Suppress("DEPRECATION")
     @Test fun readFromParcel_closedSession() {
         val session = sessionRule.createClosedSession()
 
@@ -136,7 +132,6 @@ class SessionLifecycleTest : BaseSessionTest() {
         sessionRule.session.waitForPageStop()
     }
 
-    @Suppress("DEPRECATION")
     @Test fun readFromParcel_closedSessionAfterParceling() {
         val session = sessionRule.createOpenSession()
 
@@ -153,7 +148,6 @@ class SessionLifecycleTest : BaseSessionTest() {
         sessionRule.session.waitForPageStop()
     }
 
-    @Suppress("DEPRECATION")
     @Test fun readFromParcel_closedSessionAfterReadParcel() {
         // disable test on opt for frequently failing Bug 1519591
         assumeThat(sessionRule.env.isDebugBuild, equalTo(true))
@@ -172,7 +166,6 @@ class SessionLifecycleTest : BaseSessionTest() {
         sessionRule.session.waitForPageStop()
     }
 
-    @Suppress("DEPRECATION")
     @Test fun readFromParcel_closeOpenAndLoad() {
         var newSession: GeckoSession? = null
 
@@ -187,7 +180,6 @@ class SessionLifecycleTest : BaseSessionTest() {
         newSession!!.waitForPageStop()
     }
 
-    @Suppress("DEPRECATION")
     @Test fun readFromParcel_allowCallsBeforeUnparceling() {
         val newSession = sessionRule.createClosedSession()
 
@@ -200,7 +192,6 @@ class SessionLifecycleTest : BaseSessionTest() {
         newSession.waitForPageStops(2)
     }
 
-    @Suppress("DEPRECATION")
     @Test fun readFromParcel_chained() {
         var session1: GeckoSession? = null
         var session2: GeckoSession? = null
@@ -220,7 +211,6 @@ class SessionLifecycleTest : BaseSessionTest() {
         session3!!.waitForPageStop()
     }
 
-    @Suppress("DEPRECATION")
     @NullDelegate(GeckoSession.NavigationDelegate::class)
     @ClosedSessionAtStart
     @Test fun readFromParcel_moduleUpdated() {
@@ -254,7 +244,6 @@ class SessionLifecycleTest : BaseSessionTest() {
                    onLocationCount, equalTo(1))
     }
 
-    @Suppress("DEPRECATION")
     @Test fun readFromParcel_focusedInput() {
         // When an input is focused, make sure SessionTextInput is still active after transferring.
         mainSession.loadTestPath(INPUTS_PATH)
@@ -426,7 +415,6 @@ class SessionLifecycleTest : BaseSessionTest() {
         sessionRule.waitForPageStop()
     }
 
-    @Suppress("DEPRECATION")
     @Ignore // Bug 1533934 - disabled createFromParcel on pgo for frequent failures
     @Test fun createFromParcel() {
         val session = sessionRule.createOpenSession()

mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSession.java

@@ -1289,22 +1289,12 @@ public class GeckoSession implements Parcelable {
         session.mWindow = null;
     }
 
-    /**
-     * @deprecated Use {@link GeckoSession.ProgressDelegate.onSessionStateChange} and
-     * {@link GeckoSession.restoreState} instead. This method will be removed in GeckoView 82.
-     */
-    @Deprecated // Bug 1650108
     @Override // Parcelable
     @AnyThread
     public int describeContents() {
         return 0;
     }
 
-    /**
-     * @deprecated Use {@link GeckoSession.ProgressDelegate.onSessionStateChange} and
-     * {@link GeckoSession.restoreState} instead. This method will be removed in GeckoView 82.
-     */
-    @Deprecated // Bug 1650108
     @Override // Parcelable
     @AnyThread
     public void writeToParcel(final Parcel out, final int flags) {
@@ -1314,11 +1304,6 @@ public class GeckoSession implements Parcelable {
     }
 
     // AIDL code may call readFromParcel even though it's not part of Parcelable.
-    /**
-     * @deprecated Use {@link GeckoSession.ProgressDelegate.onSessionStateChange} and
-     * {@link GeckoSession.restoreState} instead. This method will be removed in GeckoView 82.
-     */
-    @Deprecated // Bug 1650108
     @AnyThread
     @SuppressWarnings("checkstyle:javadocmethod")
     public void readFromParcel(final @NonNull Parcel source) {
@@ -1332,11 +1317,6 @@ public class GeckoSession implements Parcelable {
         transferFrom(window, settings, id);
     }
 
-    /**
-     * @deprecated Use {@link GeckoSession.ProgressDelegate.onSessionStateChange} and
-     * {@link GeckoSession.restoreState} instead. This field will be removed in GeckoView 82.
-     */
-    @Deprecated // Bug 1650108
     public static final Creator<GeckoSession> CREATOR = new Creator<GeckoSession>() {
         @Override
         @AnyThread

mobile/android/geckoview/src/main/java/org/mozilla/geckoview/doc-files/CHANGELOG.md

@@ -34,8 +34,6 @@ exclude: true
 - Added [`ProfilerController`][79.4], accessible via [`GeckoRuntime.getProfilerController`][79.5]
 to allow adding gecko profiler markers.
 ([bug 1624993]({{bugzilla}}1624993))
-- ⚠️ Deprecated `Parcelable` support in `GeckoSession` with the intention of removing
-  in GeckoView v82. ([bug 1649529]({{bugzilla}}1649529))
 
 [79.1]: {{javadoc_uri}}/WebExtension.TabDelegate.html#onOpenOptionsPage-org.mozilla.geckoview.WebExtension-
 [79.2]: {{javadoc_uri}}/WebNotification.html#source