Merge "Fixes for errorprone update" into main (67bb3d4e) · Commits · e / os / android_frameworks_base

apct-tests/perftests/core/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -66,6 +66,7 @@ android_test {
		errorprone: {
		javacflags: [
		"-Xep:ReturnValueIgnored:WARN",
		"-Xep:UnnecessaryStringBuilder:OFF",
		],
		},
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -63,7 +63,7 @@ public class HideInCommentsChecker extends BugChecker implements

		@Override
		public Description matchCompilationUnit(CompilationUnitTree tree, VisitorState state) {
		final Map<Integer, Tree> javadocableTrees = findJavadocableTrees(tree);
		final Map<Integer, Tree> javadocableTrees = findJavadocableTrees(tree, state);
		final String sourceCode = state.getSourceCode().toString();
		for (ErrorProneToken token : ErrorProneTokens.getTokens(sourceCode, state.context)) {
		for (Tokens.Comment comment : token.comments()) {
		@@ -112,9 +112,9 @@ public class HideInCommentsChecker extends BugChecker implements
		}


		private Map<Integer, Tree> findJavadocableTrees(CompilationUnitTree tree) {
		private Map<Integer, Tree> findJavadocableTrees(CompilationUnitTree tree, VisitorState state) {
		Map<Integer, Tree> javadoccableTrees = new HashMap<>();
		new SuppressibleTreePathScanner<Void, Void>() {
		new SuppressibleTreePathScanner<Void, Void>(state) {
		@Override
		public Void visitClass(ClassTree classTree, Void unused) {
		javadoccableTrees.put(getStartPosition(classTree), classTree);

+16 −0

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

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

		android_app {
		@@ -442,6 +452,12 @@ android_app {
		},

		plugins: ["dagger2-compiler"],

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

		android_robolectric_test {

+3 −0