am 4bfa1e99: Merge "Fix handling escaped chars in ssid" into jb-mr1-dev

* commit '4bfa1e99e2ce5aa96465872a159377102a5bb4cb': Fix handling escaped chars in ssid
2012-10-29 10:14:05 -07:00
parent 0b728244dc 4bfa1e99e2
commit 5193efba34
1 changed files with 6 additions and 0 deletions
--- 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++;