drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixes for errorprone update" into main am: 67bb3d4e5d am: 2beb114458 am: 5b3e51e8da

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2831008

Change-Id: Ic37db90117bf273752b0d4b3e8e7b893a7192b42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Cole Faust 2023-11-20 21:09:23 +00:00 committed by Automerger Merge Worker
commit 411be6ab83
4 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apct-tests/perftests/core/Android.bp
View File

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

6
errorprone/java/com/google/errorprone/bugpatterns/android/HideInCommentsChecker.java
View File

@ -63,7 +63,7 @@ public class HideInCommentsChecker extends BugChecker implements
@Override @Override
public Description matchCompilationUnit(CompilationUnitTree tree, VisitorState state) { 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(); final String sourceCode = state.getSourceCode().toString();
for (ErrorProneToken token : ErrorProneTokens.getTokens(sourceCode, state.context)) { for (ErrorProneToken token : ErrorProneTokens.getTokens(sourceCode, state.context)) {
for (Tokens.Comment comment : token.comments()) { 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<>(); Map<Integer, Tree> javadoccableTrees = new HashMap<>();
new SuppressibleTreePathScanner<Void, Void>() { new SuppressibleTreePathScanner<Void, Void>(state) {
@Override @Override
public Void visitClass(ClassTree classTree, Void unused) { public Void visitClass(ClassTree classTree, Void unused) {
javadoccableTrees.put(getStartPosition(classTree), classTree); javadoccableTrees.put(getStartPosition(classTree), classTree);

16
packages/SystemUI/Android.bp
View File

@ -224,6 +224,11 @@ android_library {
extra_check_modules: ["SystemUILintChecker"], extra_check_modules: ["SystemUILintChecker"],
warning_checks: ["MissingApacheLicenseDetector"], warning_checks: ["MissingApacheLicenseDetector"],
}, },
errorprone: {
javacflags: [
"-Xep:InvalidPatternSyntax:WARN",
],
},
} }
filegroup { filegroup {
@ -548,6 +553,11 @@ android_library {
test: true, test: true,
extra_check_modules: ["SystemUILintChecker"], extra_check_modules: ["SystemUILintChecker"],
}, },
errorprone: {
javacflags: [
"-Xep:InvalidPatternSyntax:WARN",
],
},
} }
android_app { android_app {
@ -589,6 +599,12 @@ android_app {
}, },
plugins: ["dagger2-compiler"], plugins: ["dagger2-compiler"],
errorprone: {
javacflags: [
"-Xep:InvalidPatternSyntax:WARN",
],
},
} }
android_robolectric_test { android_robolectric_test {

3
tests/SmokeTestApps/Android.bp
View File

@ -11,4 +11,7 @@ android_test {
name: "SmokeTestTriggerApps", name: "SmokeTestTriggerApps",
srcs: ["src/**/*.java"], srcs: ["src/**/*.java"],
sdk_version: "current", sdk_version: "current",
errorprone: {
enabled: false,
},
} }