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

Commit 965f2dee authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add AppJankTest to the java linter" into main

parents 5ead43ff ca3b4fbb

PREUPLOAD.cfg

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp 
               tools/

bpfmt = -d

ktfmt = --kotlinlang-style --include-dirs=services/permission,packages/SystemUI,libs/WindowManager/Shell/src/com/android/wm/shell/freeform,libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode,libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode,libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor,libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor,libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/desktopmode,apct-tests,tests/Input,tests/StructuredConcurrencyPerfTests,services/tests/servicestests/src/com/android/server/supervision,libs/WindowManager/Shell/src/com/android/wm/shell/compatui

google_java_format = --include-dirs=services/core/java/com/android/server/adb

google_java_format = --include-dirs=services/core/java/com/android/server/adb,tests/AppJankTest



[Hook Scripts]

checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT} --config_xml checkstyle.xml

checkstyle_suppressions.xml

+4 −4
Original line number Diff line number Diff line
@@ -2,14 +2,14 @@ 
<!DOCTYPE suppressions PUBLIC "-//Puppy Crawl//DTD Suppressions 1.1//EN" "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">

<suppressions>

    <!-- Let google-java-format handle the ImportOrder. -->

    <suppress files="services/core/java/com/android/server/adb/*" checks="ImportOrder" />

    <suppress files="services/core/java/com/android/server/adb/*,tests/AppJankTest" checks="ImportOrder" />



    <!-- Let google-java-format handle the indentation. -->

    <suppress files="services/core/java/com/android/server/adb/*" checks="Indentation" />

    <suppress files="services/core/java/com/android/server/adb/*,tests/AppJankTest" checks="Indentation" />



    <!-- Let google-java-format handle the line length. -->

    <suppress files="services/core/java/com/android/server/adb/*" checks="LineLength" />

    <suppress files="services/core/java/com/android/server/adb/*,tests/AppJankTest" checks="LineLength" />



    <!-- Let google-java-format handle the { placement. -->

    <suppress files="services/core/java/com/android/server/adb/*" checks="LeftCurly" />

    <suppress files="services/core/java/com/android/server/adb/*,tests/AppJankTest" checks="LeftCurly" />

</suppressions>