From 2559cb39534140c4b99a6b4e766a76e2e93a02d7 Mon Sep 17 00:00:00 2001 From: Fedor Kudasov Date: Tue, 9 Jul 2019 09:22:58 +0000 Subject: [PATCH] Revert "Cherry-pick the relevant parts of master change" This reverts commit 5a4844e307055c0ce26b58e99b7d7b485ecffd60. Reason for revert: multiple build breakages b/137069068 Change-Id: If48bfa2d2cab0877a053743b3ec53820d0c4ed6b --- core/java/android/net/NetworkUtils.java | 31 ------------------------- 1 file changed, 31 deletions(-) diff --git a/core/java/android/net/NetworkUtils.java b/core/java/android/net/NetworkUtils.java index d0f54b4c7f..228e62daf2 100644 --- a/core/java/android/net/NetworkUtils.java +++ b/core/java/android/net/NetworkUtils.java @@ -16,15 +16,10 @@ package android.net; -import static android.system.OsConstants.AF_INET; -import static android.system.OsConstants.AF_INET6; - -import android.annotation.NonNull; import android.annotation.UnsupportedAppUsage; import android.net.shared.Inet4AddressUtils; import android.os.Build; import android.system.ErrnoException; -import android.system.Os; import android.util.Log; import android.util.Pair; @@ -459,30 +454,4 @@ public class NetworkUtils { } return routedIPCount; } - - private static final int[] ADDRESS_FAMILIES = new int[] {AF_INET, AF_INET6}; - - /** - * Returns true if the hostname is weakly validated. - * @param hostname Name of host to validate. - * @return True if it's a valid-ish hostname. - * - * @hide - */ - public static boolean isWeaklyValidatedHostname(@NonNull String hostname) { - // TODO(b/34953048): Use a validation method that permits more accurate, - // but still inexpensive, checking of likely valid DNS hostnames. - final String weakHostnameRegex = "^[a-zA-Z0-9_.-]+$"; - if (!hostname.matches(weakHostnameRegex)) { - return false; - } - - for (int address_family : ADDRESS_FAMILIES) { - if (Os.inet_pton(address_family, hostname) != null) { - return false; - } - } - - return true; - } }