summaryrefslogtreecommitdiff
path: root/core/java/android/net/Proxy.java
diff options
context:
space:
mode:
authorSerik Beketayev <serikb@google.com>2020-12-10 00:49:48 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-12-10 00:49:48 +0000
commit006d043dfe655fc84a85d3e7feeb06fd85c11c96 (patch)
tree4f74b1a39c1594ae116dd71236f0e18b4cb61f75 /core/java/android/net/Proxy.java
parentb39b89571693230b3f18c59842064b92a95dcc73 (diff)
parentc6218f797781e3adbd330664f3974886dcda447d (diff)
Merge "[Mainline Migration] Migrate NetworkUtils" am: a086c295e7 am: c6218f7977
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1498168 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4f91f6de3af919fff42383ba86617112624c8292
Diffstat (limited to 'core/java/android/net/Proxy.java')
-rw-r--r--core/java/android/net/Proxy.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/net/Proxy.java b/core/java/android/net/Proxy.java
index f1d9669a8309..20ccc07b18dd 100644
--- a/core/java/android/net/Proxy.java
+++ b/core/java/android/net/Proxy.java
@@ -205,7 +205,7 @@ public final class Proxy {
if (host.equalsIgnoreCase("localhost")) {
return true;
}
- if (NetworkUtils.numericToInetAddress(host).isLoopbackAddress()) {
+ if (InetAddresses.parseNumericAddress(host).isLoopbackAddress()) {
return true;
}
}