From 41618b2aeb0a500c740a75871a8f614cb6543362 Mon Sep 17 00:00:00 2001 From: Kristian Monsen Date: Wed, 11 Sep 2013 15:18:59 -0700 Subject: Null check url before using instance methods Also early out to match classic behaviour. Fix for bug 10688422 Change-Id: Ic6cff8271e6c0c92ca583e4a2cf61567aa27dc00 (cherry picked from commit a5d717b8b2047e74e6b1ba6084e96f5e28e0c5e7) --- chromium/java/com/android/webview/chromium/WebViewChromium.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'chromium/java/com/android/webview') diff --git a/chromium/java/com/android/webview/chromium/WebViewChromium.java b/chromium/java/com/android/webview/chromium/WebViewChromium.java index 440b5f9..345f505 100644 --- a/chromium/java/com/android/webview/chromium/WebViewChromium.java +++ b/chromium/java/com/android/webview/chromium/WebViewChromium.java @@ -328,7 +328,7 @@ class WebViewChromium implements WebViewProvider, // 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; @@ -341,6 +341,10 @@ class WebViewChromium implements WebViewProvider, @Override public void loadUrl(String url) { + // Early out to match old WebView implementation + if (url == null) { + return; + } loadUrl(url, null); } -- cgit v1.2.3