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

Commit 772c437d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix crash when input illegal proxy port number" am: e8160af7 am: 6372ae5e am: ab0dc7b1 

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



Change-Id: Ia9db49f176a65bb2d512cd7e0694284f03414a82
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b495103c ab0dc7b1

src/com/android/settings/vpn2/ConfigDialog.java

+8 −1
Original line number Diff line number Diff line
@@ -626,7 +626,14 @@ class ConfigDialog extends AlertDialog implements TextWatcher, 
            String proxyPort = mProxyPort.getText().toString().trim();

            // 0 is a last resort default, but the interface validates that the proxy port is

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

        } else {

            profile.proxy = null;