commit 3f35ae068fe1076ca89a2815a601056a1fbb9c94
author Roshan Pius <rpius@google.com> Wed Apr 24 15:58:57 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Apr 24 15:58:57 2019 -0700
tree b06b368eb71e48195d354f8c34ce1423975a88da
parent a62b12d0e6331041b47915d0fff7d2eda79b4d92
parent 0fa902cfc69f2dabc51e491da5bd8d0448b97675

Merge "WifiSsid: Catch String out of bound exception" into qt-dev am: 4ec8b460c2
am: 0fa902cfc6

Change-Id: Ic6cab52fa6f6f55ce4ed9a46be4ea231d6a31974

wifi/java/android/net/wifi/WifiSsid.java

diff --git a/wifi/java/android/net/wifi/WifiSsid.java b/wifi/java/android/net/wifi/WifiSsid.java
index fd59390..70ca088 100644
--- a/wifi/java/android/net/wifi/WifiSsid.java
+++ b/wifi/java/android/net/wifi/WifiSsid.java
@@ -129,6 +129,8 @@
                                 val = Integer.parseInt(asciiEncoded.substring(i, i + 2), HEX_RADIX);
                             } catch (NumberFormatException e) {
                                 val = -1;
+                            } catch (StringIndexOutOfBoundsException e) {
+                                val = -1;
                             }
                             if (val < 0) {
                                 val = Character.digit(asciiEncoded.charAt(i), HEX_RADIX);