From: Lorenzo Colitti <lorenzo@google.com>
Date: Sun, 25 Mar 2018 16:32:33 +0000 (+0900)
Subject: Allow third party cookies in the captive portal login app.
X-Git-Tag: android-x86-9.0-r1~159^2~83^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c3c95bab8ec7f3ef4e7649b5d24ea6525a407c44;p=android-x86%2Fframeworks-base.git

Allow third party cookies in the captive portal login app.

Bug: 73909651
Test: Captive portal login app still works
Change-Id: I3ffda92e7d764ea9957df1a5408839cf10a26be5
---

diff --git a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
index 4db00345fc84..7828c4caa7ab 100644
--- a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
+++ b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
@@ -42,6 +42,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;
@@ -147,6 +148,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);