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

packages/SystemUI/Android.bp

+0 −16

Original line number	Diff line number	Diff line
		@@ -224,11 +224,6 @@ android_library {
		extra_check_modules: ["SystemUILintChecker"],
		warning_checks: ["MissingApacheLicenseDetector"],
		},
		errorprone: {
		javacflags: [
		"-Xep:InvalidPatternSyntax:WARN",
		],
		},
		}

		filegroup {
		@@ -553,11 +548,6 @@ android_library {
		test: true,
		extra_check_modules: ["SystemUILintChecker"],
		},
		errorprone: {
		javacflags: [
		"-Xep:InvalidPatternSyntax:WARN",
		],
		},
		}

		android_app {
		@@ -599,12 +589,6 @@ android_app {
		},

		plugins: ["dagger2-compiler"],

		errorprone: {
		javacflags: [
		"-Xep:InvalidPatternSyntax:WARN",
		],
		},
		}

		android_robolectric_test {

+3 −0

Original line number	Diff line number	Diff line
		@@ -131,6 +131,9 @@ class EmojiHelper {
		+ "\\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")
		static final Pattern EMOJI_PATTERN = Pattern.compile(UNICODE_EMOJI_REGEX);
		}