commit af1fbb77e31f6e041a0a7f8b897863eac764ae92
author Remi NGUYEN VAN <reminv@google.com> Wed Dec 23 02:22:35 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 23 02:22:35 2020 +0000
tree a44679d5959965f99db1f82e2c4f0f1c3fa79be0
parent e29951ac5608a9bcfb64f327e2b1b7d456e3fe98
parent 82b5aac768aa64c2dc51a5a7ab2b8278c1613522

Merge "Replace isWeaklyValidatedHostname with guava" am: 5cadac06b9 am: 1a57bfefb2 am: 82b5aac768

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1512667

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4ad565433a6a167d658cb92b3977e5700dac840b

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);
         }
     }