diff options
| -rw-r--r-- | packages/SystemUI/Android.bp | 16 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/people/PeopleTileViewHelper.java | 3 |
2 files changed, 3 insertions, 16 deletions
diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp index fae29918def9..8ca925b99749 100644 --- a/packages/SystemUI/Android.bp +++ b/packages/SystemUI/Android.bp @@ -209,11 +209,6 @@ android_library { lint: { extra_check_modules: ["SystemUILintChecker"], }, - errorprone: { - javacflags: [ - "-Xep:InvalidPatternSyntax:WARN", - ], - }, } filegroup { @@ -410,11 +405,6 @@ android_library { test: true, extra_check_modules: ["SystemUILintChecker"], }, - errorprone: { - javacflags: [ - "-Xep:InvalidPatternSyntax:WARN", - ], - }, } android_app { @@ -452,12 +442,6 @@ android_app { }, plugins: ["dagger2-compiler"], - - errorprone: { - javacflags: [ - "-Xep:InvalidPatternSyntax:WARN", - ], - }, } android_robolectric_test { diff --git a/packages/SystemUI/src/com/android/systemui/people/PeopleTileViewHelper.java b/packages/SystemUI/src/com/android/systemui/people/PeopleTileViewHelper.java index 67e96645f9c5..27e6895af612 100644 --- a/packages/SystemUI/src/com/android/systemui/people/PeopleTileViewHelper.java +++ b/packages/SystemUI/src/com/android/systemui/people/PeopleTileViewHelper.java @@ -165,6 +165,9 @@ public class PeopleTileViewHelper { + "\\p{Emoji}(\\p{EMod}|\\x{FE0F}\\x{20E3}?|[\\x{E0020}-\\x{E007E}]+\\x{E007F})" + "?)*"; + // Not all JDKs support emoji patterns, including the one errorprone runs under, which + // makes it think that this is an invalid pattern. + @SuppressWarnings("InvalidPatternSyntax") private static final Pattern EMOJI_PATTERN = Pattern.compile(UNICODE_EMOJI_REGEX); public static final String EMPTY_STRING = ""; |