diff options
author | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-02-10 16:55:34 +0100 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-02-10 16:55:34 +0100 |
commit | f8c5f238ea8696e049c4de8092e9d3363e17fd1a (patch) | |
tree | 150c06423956b5fd4638eee8528e980db44d3581 | |
parent | 66b46c861886b727ca197a40fcc41e004a8d2bef (diff) |
InetAddresses: don't have global android import
This allows a proper fallback on normal JRE.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
-rw-r--r-- | app/src/main/java/com/wireguard/config/InetAddresses.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/src/main/java/com/wireguard/config/InetAddresses.java b/app/src/main/java/com/wireguard/config/InetAddresses.java index d24c5716..5303e27f 100644 --- a/app/src/main/java/com/wireguard/config/InetAddresses.java +++ b/app/src/main/java/com/wireguard/config/InetAddresses.java @@ -5,7 +5,6 @@ package com.wireguard.config; -import android.os.Build; import java.lang.reflect.Method; import java.net.Inet4Address; import java.net.Inet6Address; @@ -25,7 +24,7 @@ public final class InetAddresses { static { Method m = null; try { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) + if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.Q) // noinspection JavaReflectionMemberAccess m = InetAddress.class.getMethod("parseNumericAddress", String.class); } catch (final Exception ignored) { @@ -45,7 +44,7 @@ public final class InetAddresses { if (address.isEmpty()) throw new ParseException(InetAddress.class, address, "Empty address"); try { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) + if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) return android.net.InetAddresses.parseNumericAddress(address); else if (PARSER_METHOD != null) return (InetAddress) PARSER_METHOD.invoke(null, address); |