commit 768677a837b12a22295c3a519291b41c1dd7f3f8
author Brad Ebinger <breadley@google.com> Thu Feb 16 19:58:34 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 16 19:58:34 2017 +0000
tree a62c0f52f44e574381111596218e0ab4f6244425
parent 59291b2a1e6f2c921399988a5393550bab9b8e84
parent 0f83cca1cd5e684d76077b2cddceb204d65d863a

Merge "Fix NumberFormatException in SipEditor when saving port number" am: 3a7d7b242e am: 67bd4d13ba am: 08631a0722
am: 0f83cca1cd

Change-Id: I228d22200482658c41efec02282adf9ead898585

sip/src/com/android/services/telephony/sip/SipEditor.java

diff --git a/sip/src/com/android/services/telephony/sip/SipEditor.java b/sip/src/com/android/services/telephony/sip/SipEditor.java
index 27941c3..dd475e6 100644
--- a/sip/src/com/android/services/telephony/sip/SipEditor.java
+++ b/sip/src/com/android/services/telephony/sip/SipEditor.java
@@ -360,7 +360,13 @@
                             }
                     }
                 } else if (key == PreferenceKey.Port) {
-                    int port = Integer.parseInt(PreferenceKey.Port.getValue());
+                    int port;
+                    try {
+                        port = Integer.parseInt(PreferenceKey.Port.getValue());
+                    } catch (NumberFormatException e) {
+                        showAlert(getString(R.string.not_a_valid_port));
+                        return;
+                    }
                     if ((port < 1000) || (port > 65534)) {
                         showAlert(getString(R.string.not_a_valid_port));
                         return;