diff options
| author | Toby Sargeant <tobiasjs@google.com> | 2018-01-08 12:16:00 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-01-08 12:16:00 +0000 |
| commit | da4e3b68fba1932a44ba7cc74940f4caa6b5362a (patch) | |
| tree | 04c91856b354518e5c5fe3d09ca77a64d91648b6 /core/java/android/webkit/WebView.java | |
| parent | 6b8fff4eb522b5e5ee2b9411d82598843daca0de (diff) | |
| parent | 9ea410a6f8d7859e4c54070bba12e197ef6cdb71 (diff) | |
Merge "Add a Java FindAddress implentation."
am: 9ea410a6f8
Change-Id: Iff0adac9310f836df5f75c64c17ea3c72cd940d4
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); } /** |