commit f40f71ccf18af1492afc782a55c7bd96f57aee66
author Remi NGUYEN VAN <reminv@google.com> Mon Nov 30 16:11:52 2020 +0900
committer Remi NGUYEN VAN <reminv@google.com> Tue Dec 08 14:02:17 2020 +0900
tree 23822c3512e9b7045f1b384c54d5abd8ca13c494
parent 4d181cc04f59f5a4f1d9e79c8dcb797c6b4759ca

Replace isWeaklyValidatedHostname with guava

The guava implementation is more accurate than the basic NetworkUtils
implementation.
NetworkUtils is being moved to its own JAR and will not be available
from Settings.

Bug: 174436414
Test: m
      Wrote test for isWeaklyValidatedHostname, verified it passes with
      guava
Change-Id: I1d01f2beba36009e17f651652e2d7f57be5aa398

src/com/android/settings/network/PrivateDnsModeDialogPreference.java

diff --git a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java
index bdadfe4..4878f31 100644
--- a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java
+++ b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java
@@ -28,7 +28,6 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.net.NetworkUtils;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.Settings;
@@ -56,6 +55,8 @@
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedLockUtilsInternal;
 
+import com.google.common.net.InternetDomainName;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -278,7 +279,7 @@
         final Button saveButton = getSaveButton();
         if (saveButton != null) {
             saveButton.setEnabled(modeProvider
-                    ? NetworkUtils.isWeaklyValidatedHostname(mEditText.getText().toString())
+                    ? InternetDomainName.isValid(mEditText.getText().toString())
                     : true);
         }
     }