Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82b5aac7 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Merge "Replace isWeaklyValidatedHostname with guava" am: 5cadac06 am: 1a57bfef 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d47ad22bfa3c226a6a61cb953aac104dabf4ccf
parents 94db77cc 1a57bfef

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

+3 −2
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import android.content.ContentResolver; 
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.HelpUtils; 
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 @@ public class PrivateDnsModeDialogPreference extends CustomDialogPreferenceCompat 
        final Button saveButton = getSaveButton();

        if (saveButton != null) {

            saveButton.setEnabled(modeProvider

                    ? NetworkUtils.isWeaklyValidatedHostname(mEditText.getText().toString())

                    ? InternetDomainName.isValid(mEditText.getText().toString())

                    : true);

        }

    }