diff options
| author | Toby Sargeant <tobiasjs@google.com> | 2018-01-08 21:23:45 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-01-08 21:23:45 +0000 |
| commit | ef5218836dabbcd29be61b0f27aa26be6e32af6e (patch) | |
| tree | 566599de83c795ab520f5b1098d33f849b46d3ea /core/java/android/webkit/WebView.java | |
| parent | 48d6926f38112b69ddc37423f8362048e61359e0 (diff) | |
| parent | da4e3b68fba1932a44ba7cc74940f4caa6b5362a (diff) | |
Merge "Add a Java FindAddress implentation." am: 9ea410a6f8
am: da4e3b68fb
Change-Id: I7b2448fcb2edb4bc9000fd5e55f7295e6c6ff676
Diffstat (limited to 'core/java/android/webkit/WebView.java')
| -rw-r--r-- | core/java/android/webkit/WebView.java | 7 |
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); } /** |