Bug 41679: Backport Android-specific security fixes from Firefox 111 to ESR 102.9-based Tor Browser (fenix portion)
This one wasn't too bad since it's in the same repo at least. Majority of conflicts were in test code (disabling broken tests upstream that we don't have or are already commented out).
This corresponds to the upstream commit range: d834147aff423c3eac8f670f96cac112a23e46af
through f91af61b4bb2a8c8bfd23ea48a21e43804b482ef
:
- https://github.com/mozilla-mobile/fenix/commit/f91af61b4bb2a8c8bfd23ea48a21e43804b482ef
- https://github.com/mozilla-mobile/fenix/commit/76c71758c0b898681a48e0bdbd52e735ccbc9325
- https://github.com/mozilla-mobile/fenix/commit/6428f96c4f6d96e39838ffea3cde72e6726cb80b
- https://github.com/mozilla-mobile/fenix/commit/14a81f18e5a5eb4775441ec5da5c91383916c0f5
- https://github.com/mozilla-mobile/fenix/commit/d834147aff423c3eac8f670f96cac112a23e46af
Did have to be a bit careful because they've likely auto-linted upstream which adds many (technically) necessary commas we didn't have but I think I caught them all.
Doing a testbuild on tb-build-05
overnight and we'll find out I suppose.