diff options
| author | Toby Sargeant <tobiasjs@google.com> | 2018-01-09 00:12:33 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-01-09 00:12:33 +0000 |
| commit | 13e0861efafa4d9e06174747b654a8968fe792ee (patch) | |
| tree | 813021470158eddb550c5a09df77b49258f0467d /core/java/android/webkit/WebView.java | |
| parent | f2beec008d9d59aafe8e63fe0cafbc78bcad77dc (diff) | |
| parent | ef5218836dabbcd29be61b0f27aa26be6e32af6e (diff) | |
Merge "Add a Java FindAddress implentation." am: 9ea410a6f8 am: da4e3b68fb
am: ef5218836d
Change-Id: Ic896c9f805330c28e9e0c3ca583f28e80bc47184
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 5316d0db376e..deb94e816a69 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -1831,9 +1831,10 @@ public class WebView extends AbsoluteLayout */ @Nullable 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); } /** |