From b2eabdd40a1777579551d713a334a2b8cc00a8ec Mon Sep 17 00:00:00 2001
From: Sarah Chin <sarahchin@google.com>
Date: Wed, 24 May 2023 19:28:25 -0700
Subject: [PATCH] Clear cookies and webview state for new purchase requests

Cookie store is separate from WebView and persisted to the device, so it
could be saved across sessions. Clear any state that might be saved for
each new request.

Test: manual verify during IODT
Bug: 282129516
Change-Id: If97c57dd1c49e1c6971ff99c6b8aa0834f62ee00
---
 .../android/carrierdefaultapp/SlicePurchaseActivity.java   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/SlicePurchaseActivity.java b/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/SlicePurchaseActivity.java
index d304394dacb7f..3aaa994f34bb4 100644
--- a/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/SlicePurchaseActivity.java
+++ b/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/SlicePurchaseActivity.java
@@ -27,6 +27,7 @@ import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.KeyEvent;
+import android.webkit.CookieManager;
 import android.webkit.WebView;
 
 import com.android.phone.slice.SlicePurchaseController;
@@ -168,6 +169,12 @@ public class SlicePurchaseActivity extends Activity {
         // Create WebView
         mWebView = new WebView(this);
 
+        // Clear any cookies and state that might be saved from previous sessions
+        CookieManager.getInstance().removeAllCookies(null);
+        CookieManager.getInstance().flush();
+        mWebView.clearCache(true);
+        mWebView.clearHistory();
+
         // Enable JavaScript for the carrier purchase website to send results back to
         //  the slice purchase application.
         mWebView.getSettings().setJavaScriptEnabled(true);