allow + in usernames

2 files changed, 3 insertions, 3 deletions

diff --git a/common/java/com/android/common/Patterns.java b/common/java/com/android/common/Patterns.java
index 2eab3e1..24a18c0 100644
--- a/common/java/com/android/common/Patterns.java
+++ b/common/java/com/android/common/Patterns.java
@@ -122,7 +122,7 @@ public class Patterns {
 
     public static final Pattern EMAIL_ADDRESS
         = Pattern.compile(
-            "[a-zA-Z0-9\\+\\.\\_\\%\\-]{1,256}" +
+            "[a-zA-Z0-9\\+\\.\\_\\%\\-\\+]{1,256}" +
             "\\@" +
             "[a-zA-Z0-9][a-zA-Z0-9\\-]{0,64}" +
             "(" +
diff --git a/core/java/android/text/LoginFilter.java b/core/java/android/text/LoginFilter.java
index 9045c09..e2d1596 100644
--- a/core/java/android/text/LoginFilter.java
+++ b/core/java/android/text/LoginFilter.java
@@ -158,11 +158,11 @@ public abstract class LoginFilter implements InputFilter {
 
     /**
      * This filter rejects characters in the user name that are not compatible with Google login.
-     * It is slightly less restrictive than the above filter in that it allows [a-zA-Z0-9._-]. 
+     * It is slightly less restrictive than the above filter in that it allows [a-zA-Z0-9._-+]. 
      * 
      */
     public static class UsernameFilterGeneric extends LoginFilter {
-        private static final String mAllowed = "@_-."; // Additional characters
+        private static final String mAllowed = "@_-+."; // Additional characters
         
         public UsernameFilterGeneric() {
             super(false);