[WebView] Don't try to set cookies with null values.

android_webview/glue/java/src/com/android/webview/chromium/CookieManagerAdapter.java

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package com.android.webview.chromium;
 
 import android.net.ParseException;
 import android.net.WebAddress;
-import android.util.Log;
 import android.webkit.CookieManager;
 import android.webkit.ValueCallback;
 import android.webkit.WebView;
 
 import org.chromium.android_webview.AwCookieManager;
+import org.chromium.base.Log;
 import org.chromium.base.annotations.SuppressFBWarnings;
 
 /**
  * Chromium implementation of CookieManager -- forwards calls to the
  * chromium internal implementation.
  */
 @SuppressWarnings("deprecation")
 @SuppressFBWarnings("CHROMIUM_SYNCHRONIZED_METHOD")
 public class CookieManagerAdapter extends CookieManager {
-    private static final String LOGTAG = "CookieManager";
+    private static final String TAG = "CookieManager";
 
     AwCookieManager mChromeCookieManager;
 
     public CookieManagerAdapter(AwCookieManager chromeCookieManager) {
         mChromeCookieManager = chromeCookieManager;
     }
 
     @Override
     public synchronized void setAcceptCookie(boolean accept) {
         mChromeCookieManager.setAcceptCookie(accept);
     }
 
     @Override
     public synchronized boolean acceptCookie() {
         return mChromeCookieManager.acceptCookie();
     }
 
     @Override
     public synchronized void setAcceptThirdPartyCookies(WebView webView, boolean accept) {
         webView.getSettings().setAcceptThirdPartyCookies(accept);
     }
 
     @Override
     public synchronized boolean acceptThirdPartyCookies(WebView webView) {
         return webView.getSettings().getAcceptThirdPartyCookies();
     }
 
     @Override
     public void setCookie(String url, String value) {
+        if (value == null) {
+            Log.e(TAG, "Not setting cookie with null value for URL: %s", url);
+            return;
+        }
+
         try {
             mChromeCookieManager.setCookie(fixupUrl(url), value);
         } catch (ParseException e) {
-            Log.e(LOGTAG, "Not setting cookie due to error parsing URL: " + url, e);
+            Log.e(TAG, "Not setting cookie due to error parsing URL: %s", url, e);
         }
     }
 
     @Override
     public void setCookie(String url, String value, ValueCallback<Boolean> callback) {
+        if (value == null) {
+            Log.e(TAG, "Not setting cookie with null value for URL: %s", url);
+            return;
+        }
+
         try {
             mChromeCookieManager.setCookie(fixupUrl(url), value, callback);
         } catch (ParseException e) {
-            Log.e(LOGTAG, "Not setting cookie due to error parsing URL: " + url, e);
+            Log.e(TAG, "Not setting cookie due to error parsing URL: %s", url, e);
         }
     }
 
     @Override
     public String getCookie(String url) {
         try {
             return mChromeCookieManager.getCookie(fixupUrl(url));
         } catch (ParseException e) {
-            Log.e(LOGTAG, "Unable to get cookies due to error parsing URL: " + url, e);
+            Log.e(TAG, "Unable to get cookies due to error parsing URL: %s", url, e);
             return null;
         }
     }
 
     @Override
     public String getCookie(String url, boolean privateBrowsing) {
         return getCookie(url);
     }
 
     // TODO(igsolla): remove this override once the WebView apk does not longer need
@@ skipping 58 matching lines @@
     }
 
     private static String fixupUrl(String url) throws ParseException {
         // WebAddress is a private API in the android framework and a "quirk"
         // of the Classic WebView implementation that allowed embedders to
         // be relaxed about what URLs they passed into the CookieManager, so we
         // do the same normalisation before entering the chromium stack.
         return new WebAddress(url).toString();
     }
 }