commit dbf9e67132a8e13415db2c2460678ecf4fdb321b
author Colin Cross <ccross@android.com> Tue Apr 16 16:34:50 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Apr 16 16:34:50 2019 -0700
tree fd0371f30de7a7c64a89c05d2de7c98246401a0f
parent 315d8d3f7010ff5b2878421b3efa1cb355382eb4
parent 485b019679f2556d3a136f31728cfc9dd1861a3d

Update messaging for guava 27.1
am: 485b019679

Change-Id: I39ed624add43b2c1d0a2ecb6d75fad7c091bd7b2

src/com/android/messaging/util/EmailAddress.java

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 @@
         // 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 @@
             // 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;
             }
         }