From 0663cf891619a29c2a7df31afae87ca6b7db6824 Mon Sep 17 00:00:00 2001
From: Sebastian Kaspari <s.kaspari@gmail.com>
Date: Wed, 23 Sep 2020 15:11:48 +0200
Subject: [PATCH] [fenix] Issue
 https://github.com/mozilla-mobile/fenix/issues/13270: Do not launch into
 Fennec's task anymore.

Initially we did this to avoid a duplicated task right after the migration from Fennec. We'd end up
with the original task from Fennec and the new one from Fenix; with the Fennec task still showing
Fennec in the app switcher, but launching Fenix once selected.

Anyhow, now on Android 11 this causes the Fenix task to get duplicated. The simple fix is to not
do any of that anymore. This may re-introduce the problem with the Fennec migration, but:
* We are at 100% rollout for quite some time. There are still users migrating, but the impact
  of the bug is much lower.
* The bug after the migration was only temporary. This bug here is happening every time you
  launch Fenix. So I'd rather fix this than a possible inconvenience right after the migration.
---
 app/src/migration/AndroidManifest.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/src/migration/AndroidManifest.xml b/app/src/migration/AndroidManifest.xml
index b89be38251..a90db330d0 100644
--- a/app/src/migration/AndroidManifest.xml
+++ b/app/src/migration/AndroidManifest.xml
@@ -19,12 +19,10 @@
         <activity-alias
             android:name="${applicationId}.App"
             android:targetActivity="org.mozilla.fenix.MigrationDecisionActivity"
-            android:taskAffinity="${applicationId}.BROWSER"
             tools:replace="android:targetActivity" />
 
         <activity
             android:name="org.mozilla.fenix.MigrationDecisionActivity"
-            android:taskAffinity="${applicationId}.BROWSER"
             android:exported="false" />
 
         <service android:name="org.mozilla.fenix.MigrationService" />