From 485b019679f2556d3a136f31728cfc9dd1861a3d Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 11 Apr 2019 14:34:50 -0700 Subject: [PATCH] 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) --- src/com/android/messaging/util/EmailAddress.java | 4 ++-- 1 file 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; } }