From be5e7b4aa3d7e4d6f46ea44fa4ea6920ca740aa9 Mon Sep 17 00:00:00 2001
From: Michelle Brubaker <michelleb@stripe.com>
Date: Sun, 25 Jul 2021 19:32:49 -0400
Subject: [PATCH 1/2] Make the StripeBrowserLauncherActivity a single instance
 so that it clears the activities up until the StripeBrowserLauncher.

Attempt to fix 3952
---
 payments-core/AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/payments-core/AndroidManifest.xml b/payments-core/AndroidManifest.xml
index 53532b7ca32..33cbc10e6b9 100644
--- a/payments-core/AndroidManifest.xml
+++ b/payments-core/AndroidManifest.xml
@@ -32,7 +32,7 @@
         <activity
             android:name=".payments.StripeBrowserLauncherActivity"
             android:theme="@style/StripeTransparentTheme"
-            android:launchMode="singleTop"
+            android:launchMode="singleInstance"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />

From 3be26ec33d227a96272af1508cfff9b1ef67c44b Mon Sep 17 00:00:00 2001
From: Michelle Brubaker <michelleb@stripe.com>
Date: Mon, 26 Jul 2021 13:06:39 -0400
Subject: [PATCH 2/2] Switch to singleTask

---
 payments-core/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/payments-core/AndroidManifest.xml b/payments-core/AndroidManifest.xml
index 33cbc10e6b9..1570ae056ba 100644
--- a/payments-core/AndroidManifest.xml
+++ b/payments-core/AndroidManifest.xml
@@ -32,7 +32,7 @@
         <activity
             android:name=".payments.StripeBrowserLauncherActivity"
             android:theme="@style/StripeTransparentTheme"
-            android:launchMode="singleInstance"
+            android:launchMode="singleTask"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -93,4 +93,4 @@
         <package android:name="com.android.chrome" />
     </queries>
 
-</manifest>
\ No newline at end of file
+</manifest>