PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4ad565433a6a167d658cb92b3977e5700dac840b
This commit is contained in:
Remi NGUYEN VAN
2020-12-23 02:22:35 +00:00
committed by Automerger Merge Worker
parent e29951ac56 82b5aac768
commit af1fbb77e3
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/network/PrivateDnsModeDialogPreference.java
View File

@@ -28,7 +28,6 @@ import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.net.NetworkUtils;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.UserManager; import android.os.UserManager;
import android.provider.Settings; import android.provider.Settings;
@@ -56,6 +55,8 @@ import com.android.settingslib.HelpUtils;
import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal; import com.android.settingslib.RestrictedLockUtilsInternal;
import com.google.common.net.InternetDomainName;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@@ -278,7 +279,7 @@ public class PrivateDnsModeDialogPreference extends CustomDialogPreferenceCompat
final Button saveButton = getSaveButton(); final Button saveButton = getSaveButton();
if (saveButton != null) { if (saveButton != null) {
saveButton.setEnabled(modeProvider saveButton.setEnabled(modeProvider
? NetworkUtils.isWeaklyValidatedHostname(mEditText.getText().toString()) ? InternetDomainName.isValid(mEditText.getText().toString())
: true); : true);
} }
} }