Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2beb1144 authored by Cole Faust's avatar Cole Faust Committed by Automerger Merge Worker
Browse files

Merge "Fixes for errorprone update" into main am: 67bb3d4e 

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



Change-Id: I8885d2a7d58ccf6fc10155f744603d873b5e3cf2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 45c0b3fe 67bb3d4e

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",

        ],

    },

}

errorprone/java/com/google/errorprone/bugpatterns/android/HideInCommentsChecker.java

+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);

packages/SystemUI/Android.bp

+16 −0
Original line number Diff line number Diff line
@@ -212,6 +212,11 @@ android_library { 
    lint: {

        extra_check_modules: ["SystemUILintChecker"],

    },

    errorprone: {

        javacflags: [

            "-Xep:InvalidPatternSyntax:WARN",

        ],

    },

}



filegroup {
@@ -427,6 +432,11 @@ android_library { 
        test: true,

        extra_check_modules: ["SystemUILintChecker"],

    },

    errorprone: {

        javacflags: [

            "-Xep:InvalidPatternSyntax:WARN",

        ],

    },

}



android_app {
@@ -464,6 +474,12 @@ android_app { 
    },



    plugins: ["dagger2-compiler"],



    errorprone: {

        javacflags: [

            "-Xep:InvalidPatternSyntax:WARN",

        ],

    },

}



android_robolectric_test {

tests/SmokeTestApps/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -11,4 +11,7 @@ android_test { 
    name: "SmokeTestTriggerApps",

    srcs: ["src/**/*.java"],

    sdk_version: "current",

    errorprone: {

        enabled: false,

    },

}