aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2019-04-11 14:34:50 -0700
committerColin Cross <ccross@android.com>2019-04-15 21:45:16 -0700
commit485b019679f2556d3a136f31728cfc9dd1861a3d (patch)
treefd0371f30de7a7c64a89c05d2de7c98246401a0f
parent8e71d1b707123e1b48b5529b1661d53762922400 (diff)
downloadMessaging-485b019679f2556d3a136f31728cfc9dd1861a3d.tar.gz
Update messaging for guava 27.1
CharMatcher.ASCII has been replaced with CharMatcher.ascii(). Bug: 130306229 Test: m checkbuild Change-Id: I21473e2aa5e432b135fac7f1ecf0a85f52f3951e Merged-In: I21473e2aa5e432b135fac7f1ecf0a85f52f3951e Exempt-From-Owner-Approval: cherry pick (cherry picked from commit 63cffd0246a37c6256684252e9a36166c74f21fb)
-rw-r--r--src/com/android/messaging/util/EmailAddress.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/messaging/util/EmailAddress.java b/src/com/android/messaging/util/EmailAddress.java
index 0c0dab9..c59170e 100644
--- a/src/com/android/messaging/util/EmailAddress.java
+++ b/src/com/android/messaging/util/EmailAddress.java
@@ -160,7 +160,7 @@ public final class EmailAddress {
// Host must not have any disallowed characters; allowI18n dictates whether
// host must be ASCII.
if (!EMAIL_ALLOWED_CHARS.matchesAllOf(host)
- || (!allowI18n && !CharMatcher.ASCII.matchesAllOf(host))) {
+ || (!allowI18n && !CharMatcher.ascii().matchesAllOf(host))) {
return false;
}
@@ -182,7 +182,7 @@ public final class EmailAddress {
// User must not have any disallowed characters; allow I18n dictates whether
// user must be ASCII.
if (!EMAIL_ALLOWED_CHARS.matchesAllOf(user)
- || (!allowI18n && !CharMatcher.ASCII.matchesAllOf(user))) {
+ || (!allowI18n && !CharMatcher.ascii().matchesAllOf(user))) {
return false;
}
}