Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow three digit phone numbers"

Browse Source
This commit is contained in:
Wink Saville
2013-02-20 23:04:31 +00:00
committed by Gerrit Code Review
parent c36303a66d a37fc575a4
commit b5a1ce2f5d
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/util/Patterns.java
View File

@@ -172,7 +172,7 @@ public class Patterns {
= Pattern.compile( // sdd = space, dot, or dash = Pattern.compile( // sdd = space, dot, or dash
"(\\+[0-9]+[\\- \\.]*)?" // +<digits><sdd>* "(\\+[0-9]+[\\- \\.]*)?" // +<digits><sdd>*
+ "(\\([0-9]+\\)[\\- \\.]*)?" // (<digits>)<sdd>* + "(\\([0-9]+\\)[\\- \\.]*)?" // (<digits>)<sdd>*
+ "([0-9][0-9\\- \\.][0-9\\- \\.]+[0-9])"); // <digit><digit|sdd>+<digit> + "([0-9][0-9\\- \\.]+[0-9])"); // <digit><digit|sdd>+<digit>
/** /**
* Convenience method to take all of the non-null matching groups in a * Convenience method to take all of the non-null matching groups in a

2
core/tests/coretests/src/android/util/PatternsTest.java
View File

@@ -156,6 +156,8 @@ public class PatternsTest extends TestCase {
"Me: 16505551212 this\n", "Me: 16505551212 this\n",
"Me: 6505551212 this\n", "Me: 6505551212 this\n",
"Me: 5551212 this\n", "Me: 5551212 this\n",
"Me: 2211 this\n",
"Me: 112 this\n",
"Me: 1-650-555-1212 this\n", "Me: 1-650-555-1212 this\n",
"Me: (650) 555-1212 this\n", "Me: (650) 555-1212 this\n",