commit a5d717b8b2047e74e6b1ba6084e96f5e28e0c5e7
author Kristian Monsen <kristianm@google.com> Wed Sep 11 15:18:59 2013 -0700
committer Kristian Monsen <kristianm@google.com> Wed Sep 11 15:18:59 2013 -0700
tree 1502e59e075ce71fa73cc730589c1bb90163ea67
parent 7f12bfd97115c70b8bb1c956d022f47e6c811977

Null check url before using instance methods

Also early out to match classic behaviour.

Fix for bug 10688422

Change-Id: Ic6cff8271e6c0c92ca583e4a2cf61567aa27dc00

chromium/java/com/android/webview/chromium/WebViewChromium.java

diff --git a/chromium/java/com/android/webview/chromium/WebViewChromium.java b/chromium/java/com/android/webview/chromium/WebViewChromium.java
index faffd51..45b4eab 100644
--- a/chromium/java/com/android/webview/chromium/WebViewChromium.java
+++ b/chromium/java/com/android/webview/chromium/WebViewChromium.java
@@ -326,7 +326,7 @@
         // have the result of that URL replace the content of the current page.
         final String JAVASCRIPT_SCHEME = "javascript:";
         if (mAppTargetSdkVersion < Build.VERSION_CODES.KITKAT &&
-                url.startsWith(JAVASCRIPT_SCHEME)) {
+                url != null && url.startsWith(JAVASCRIPT_SCHEME)) {
             mAwContents.evaluateJavaScriptEvenIfNotYetNavigated(
                     url.substring(JAVASCRIPT_SCHEME.length()));
             return;
@@ -339,6 +339,10 @@
 
     @Override
     public void loadUrl(String url) {
+        // Early out to match old WebView implementation
+        if (url == null) {
+            return;
+        }
         loadUrl(url, null);
     }