Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Replace Proxy hidden constants and methods usages" am: e3be1ecb38 am: 5c5b36f19d am: dbd031a46f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I60eb5717af5855b80290af92bed14f2fc702e7a9
This commit is contained in:
Chiachang Wang
2021-02-08 12:12:48 +00:00
committed by Automerger Merge Worker
parent 74eb482fba dbd031a46f
commit 36999b5d78
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/vpn2/ConfigDialog.java
View File

@@ -21,7 +21,6 @@ import static com.android.internal.net.VpnProfile.isLegacyType;
import android.content.Context;
import android.content.DialogInterface;
import android.content.pm.PackageManager;
import android.net.Proxy;
import android.net.ProxyInfo;
import android.os.Bundle;
import android.os.SystemProperties;
@@ -41,6 +40,7 @@ import android.widget.TextView;
import androidx.appcompat.app.AlertDialog;
import com.android.internal.net.VpnProfile;
import com.android.net.module.util.ProxyUtils;
import com.android.settings.R;
import java.net.InetAddress;
@@ -637,7 +637,7 @@ class ConfigDialog extends AlertDialog implements TextWatcher,
final String host = mProxyHost.getText().toString().trim();
final String port = mProxyPort.getText().toString().trim();
return Proxy.validate(host, port, "") == Proxy.PROXY_VALID;
return ProxyUtils.validate(host, port, "") == ProxyUtils.PROXY_VALID;
}
}