From a911e61ce7e0153cc77d881fbb16f1bf0c2ad091 Mon Sep 17 00:00:00 2001
From: Shen Lin <shhenlin@gmail.com>
Date: Mon, 17 Oct 2022 13:06:07 +0800
Subject: [PATCH] Fix crash when input illegal proxy port number

Bug: 253951250
Test: manual and atest
Change-Id: I80d2f0e3ce2df86a081b29d8633e06cfc648baeb
---
 src/com/android/settings/vpn2/ConfigDialog.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/vpn2/ConfigDialog.java b/src/com/android/settings/vpn2/ConfigDialog.java
index bf0dfc9c5b8..be2a68e237a 100644
--- a/src/com/android/settings/vpn2/ConfigDialog.java
+++ b/src/com/android/settings/vpn2/ConfigDialog.java
@@ -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;