Merge "Suppress InvalidPatternSyntax issue instead of demoting" into main (0cb5a08b) · Commits · e / os / android_frameworks_base

packages/SystemUI/Android.bp

+0 −16

Original line number	Diff line number	Diff line
		@@ -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 {

+3 −0

Original line number	Diff line number	Diff line
		@@ -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 = "";