Merge "Suppress InvalidPatternSyntax issue instead of demoting" into main am: 0cb5a08bb4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2839157
Change-Id: I56b4300353bedfadfd78f662538ba76b2f726925
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp
index c06ae11..ad08c51 100644
--- a/packages/SystemUI/Android.bp
+++ b/packages/SystemUI/Android.bp
@@ -212,11 +212,6 @@
lint: {
extra_check_modules: ["SystemUILintChecker"],
},
- errorprone: {
- javacflags: [
- "-Xep:InvalidPatternSyntax:WARN",
- ],
- },
}
filegroup {
@@ -432,11 +427,6 @@
test: true,
extra_check_modules: ["SystemUILintChecker"],
},
- errorprone: {
- javacflags: [
- "-Xep:InvalidPatternSyntax:WARN",
- ],
- },
}
android_app {
@@ -474,12 +464,6 @@
},
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 67e9664..27e6895 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 @@
+ "\\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 = "";