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

Merge "[webview] Fix handling of unicode digits in address detection."

Browse Source 
am: 8abff6b4d0

Change-Id: I08b798ac8867c14098a48dd2782ceab794360683
This commit is contained in:
Tobias Sargeant
2019-10-11 03:57:24 -07:00
committed by android-build-merger
parent bf7239e2fb 8abff6b4d0
commit e71eaf3f5e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/webkit/FindAddress.java
View File

@@ -154,7 +154,7 @@ class FindAddress {
// A house number component is "one" or a number, optionally
// followed by a single alphabetic character, or
private static final String HOUSE_COMPONENT = "(?:one|\\d+([a-z](?=[^a-z]|$)|st|nd|rd|th)?)";
private static final String HOUSE_COMPONENT = "(?:one|[0-9]+([a-z](?=[^a-z]|$)|st|nd|rd|th)?)";
// House numbers are a repetition of |HOUSE_COMPONENT|, separated by -, and followed by
// a delimiter character.
@@ -253,10 +253,10 @@ class FindAddress {
Pattern.CASE_INSENSITIVE);
private static final Pattern sSuffixedNumberRe =
Pattern.compile("(\\d+)(st|nd|rd|th)", Pattern.CASE_INSENSITIVE);
Pattern.compile("([0-9]+)(st|nd|rd|th)", Pattern.CASE_INSENSITIVE);
private static final Pattern sZipCodeRe =
Pattern.compile("(?:\\d{5}(?:-\\d{4})?)" + WORD_END, Pattern.CASE_INSENSITIVE);
Pattern.compile("(?:[0-9]{5}(?:-[0-9]{4})?)" + WORD_END, Pattern.CASE_INSENSITIVE);
private static boolean checkHouseNumber(String houseNumber) {
// Make sure that there are at most 5 digits.