From 1fb8a8f901d3479eb365eee17836e26d9137243e Mon Sep 17 00:00:00 2001
From: Jeff Davidson <jpd@google.com>
Date: Tue, 31 Mar 2015 12:12:16 -0700
Subject: [PATCH] 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
---
 core/java/android/net/WifiKey.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/java/android/net/WifiKey.java b/core/java/android/net/WifiKey.java
index 71df2f9f1ce21..99de99ece1e5d 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}");