summaryrefslogtreecommitdiff
path: root/core/java/android/webkit/WebView.java
diff options
context:
space:
mode:
authorToby Sargeant <tobiasjs@google.com>2018-01-08 12:05:12 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-01-08 12:05:12 +0000
commit9ea410a6f8d7859e4c54070bba12e197ef6cdb71 (patch)
treeb0b808172badbc7523bac93f2414ed3ead4fa922 /core/java/android/webkit/WebView.java
parentabac8f7a86ef86b15aac45bc77b5ef1394a8e3bc (diff)
parentf4d85d806e72b7a349123f870bc2712fe01b55d5 (diff)
Merge "Add a Java FindAddress implentation."
Diffstat (limited to 'core/java/android/webkit/WebView.java')
-rw-r--r--core/java/android/webkit/WebView.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 637b60e2dcb4..244b6bd51f96 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -1797,9 +1797,10 @@ public class WebView extends AbsoluteLayout
* @return the address, or if no address is found, null
*/
public static String findAddress(String addr) {
- // TODO: Rewrite this in Java so it is not needed to start up chromium
- // Could also be deprecated
- return getFactory().getStatics().findAddress(addr);
+ if (addr == null) {
+ throw new NullPointerException("addr is null");
+ }
+ return FindAddress.findAddress(addr);
}
/**