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

Commit a911e61c authored by Shen Lin's avatar Shen Lin
Browse files

Fix crash when input illegal proxy port number 

Bug: 253951250
Test: manual and atest
Change-Id: I80d2f0e3ce2df86a081b29d8633e06cfc648baeb
parent df8e9c63

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;