From a039850cc36cbd4383983884993b35e0f3f91fda Mon Sep 17 00:00:00 2001
From: Lorenzo Colitti <lorenzo@google.com>
Date: Mon, 26 Mar 2018 01:32:33 +0900
Subject: [PATCH] Allow third party cookies in the captive portal login app.

Fix: 73909651
Test: Captive portal login app still works
Change-Id: I3ffda92e7d764ea9957df1a5408839cf10a26be5
Merged-In: I0174124cad9c108a26594b0ddd6162ca3ea6e68d
(cherry picked from commit c3c95bab8ec7f3ef4e7649b5d24ea6525a407c44)
---
 .../android/captiveportallogin/CaptivePortalLoginActivity.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
index e13aba7e5fe6b..23f77323c28b0 100644
--- a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
+++ b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
@@ -41,6 +41,7 @@ import android.util.SparseArray;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.webkit.CookieManager;
 import android.webkit.SslErrorHandler;
 import android.webkit.WebChromeClient;
 import android.webkit.WebSettings;
@@ -145,6 +146,7 @@ public class CaptivePortalLoginActivity extends Activity {
 
         final WebView webview = getWebview();
         webview.clearCache(true);
+        CookieManager.getInstance().setAcceptThirdPartyCookies(webview, true);
         WebSettings webSettings = webview.getSettings();
         webSettings.setJavaScriptEnabled(true);
         webSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_COMPATIBILITY_MODE);