summaryrefslogtreecommitdiffstats
path: root/wifi
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2012-10-29 10:01:38 -0700
committerIrfan Sheriff <isheriff@google.com>2012-10-29 10:01:38 -0700
commit11de9e5537914bbe140fd99ad55333e48a14a667 (patch)
treeba269be591b41434d959696910fdb609ef67b68b /wifi
parent2bc0c5fef25fe6d64b976133a3434233f3515d78 (diff)
downloadframeworks_base-11de9e5537914bbe140fd99ad55333e48a14a667.zip
frameworks_base-11de9e5537914bbe140fd99ad55333e48a14a667.tar.gz
frameworks_base-11de9e5537914bbe140fd99ad55333e48a14a667.tar.bz2
Fix handling escaped chars in ssid
Bug: 7427185 Change-Id: Ie669dff01af0865ea50305f3b48cf3f7af92cf6f
Diffstat (limited to 'wifi')
-rw-r--r--wifi/java/android/net/wifi/WifiSsid.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/wifi/java/android/net/wifi/WifiSsid.java b/wifi/java/android/net/wifi/WifiSsid.java
index 3e5f10f..55e9b2d 100644
--- a/wifi/java/android/net/wifi/WifiSsid.java
+++ b/wifi/java/android/net/wifi/WifiSsid.java
@@ -89,21 +89,27 @@ public class WifiSsid implements Parcelable {
switch(asciiEncoded.charAt(i)) {
case '\\':
octets.write('\\');
+ i++;
break;
case '"':
octets.write('"');
+ i++;
break;
case 'n':
octets.write('\n');
+ i++;
break;
case 'r':
octets.write('\r');
+ i++;
break;
case 't':
octets.write('\t');
+ i++;
break;
case 'e':
octets.write(27); //escape char
+ i++;
break;
case 'x':
i++;