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

Merge "Fix crash when input illegal proxy port number" am: e8160af796 am: 6372ae5e93 am: ab0dc7b129

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

Change-Id: Ia9db49f176a65bb2d512cd7e0694284f03414a82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-10-18 21:43:26 +00:00
committed by Automerger Merge Worker
parent b495103ca7 ab0dc7b129
commit 772c437de4
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -626,7 +626,14 @@ class ConfigDialog extends AlertDialog implements TextWatcher,
String proxyPort = mProxyPort.getText().toString().trim(); String proxyPort = mProxyPort.getText().toString().trim();
// 0 is a last resort default, but the interface validates that the proxy port is // 0 is a last resort default, but the interface validates that the proxy port is
// present and non-zero. // present and non-zero.
int port = proxyPort.isEmpty() ? 0 : Integer.parseInt(proxyPort); int port = 0;
if (!proxyPort.isEmpty()) {
try {
port = Integer.parseInt(proxyPort);
} catch (NumberFormatException e) {
Log.e(TAG, "Could not parse proxy port integer ", e);
}
}
profile.proxy = ProxyInfo.buildDirectProxy(proxyHost, port); profile.proxy = ProxyInfo.buildDirectProxy(proxyHost, port);
} else { } else {
profile.proxy = null; profile.proxy = null;