diff options
| author | 2015-03-31 12:12:16 -0700 | |
|---|---|---|
| committer | 2015-03-31 19:48:18 +0000 | |
| commit | 1fb8a8f901d3479eb365eee17836e26d9137243e (patch) | |
| tree | 97d5142b81caee48ee2848838e9a3bd70e0f8b6c | |
| parent | eb9a10c829646f4d49404124de5fdf0cc60f419e (diff) | |
Actually allow all valid characters in a Wi-Fi SSID.
By default . doesn't match line terminators, which are valid
characters in a Wi-Fi SSID.
Bug: 19990569
Change-Id: Id4802ef3f020075238d24bcd5529eaf1c18c90dd
| -rw-r--r-- | core/java/android/net/WifiKey.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/net/WifiKey.java b/core/java/android/net/WifiKey.java index 71df2f9f1ce2..99de99ece1e5 100644 --- a/core/java/android/net/WifiKey.java +++ b/core/java/android/net/WifiKey.java @@ -33,7 +33,8 @@ import java.util.regex.Pattern; public class WifiKey implements Parcelable { // Patterns used for validation. - private static final Pattern SSID_PATTERN = Pattern.compile("(\".*\")|(0x[\\p{XDigit}]+)"); + private static final Pattern SSID_PATTERN = Pattern.compile("(\".*\")|(0x[\\p{XDigit}]+)", + Pattern.DOTALL); private static final Pattern BSSID_PATTERN = Pattern.compile("([\\p{XDigit}]{2}:){5}[\\p{XDigit}]{2}"); |