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

Commit 4de5aca1 authored by Peter Kalauskas's avatar Peter Kalauskas Committed by Automerger Merge Worker
Browse files

Merge "Support lint suppression" into tm-qpr-dev am: a006b9f8 am: 574a947d 

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



Change-Id: I8658b79dfb3c0d3623b7b812d8ec1bddd5fa51e9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ac80bb25 574a947d

packages/SystemUI/checks/src/com/android/internal/systemui/lint/BindServiceOnMainThreadDetector.kt

+5 −5
Original line number Diff line number Diff line
@@ -59,9 +59,9 @@ class BindServiceOnMainThreadDetector : Detector(), SourceCodeScanner { 
                    !hasWorkerThreadAnnotation(context, node.getParentOfType(UClass::class.java))

            ) {

                context.report(

                    ISSUE,

                    method,

                    context.getLocation(node),

                    issue = ISSUE,

                    location = context.getLocation(node),

                    message =

                        "This method should be annotated with `@WorkerThread` because " +

                            "it calls ${method.name}",

                )

packages/SystemUI/checks/src/com/android/internal/systemui/lint/BroadcastSentViaContextDetector.kt

+3 −4
Original line number Diff line number Diff line
@@ -52,10 +52,9 @@ class BroadcastSentViaContextDetector : Detector(), SourceCodeScanner { 
        val evaluator = context.evaluator

        if (evaluator.isMemberInSubClassOf(method, CLASS_CONTEXT)) {

            context.report(

                    ISSUE,

                    method,

                    context.getNameLocation(node),

                    "`Context.${method.name}()` should be replaced with " +

                    issue = ISSUE,

                    location = context.getNameLocation(node),

                    message = "`Context.${method.name}()` should be replaced with " +

                    "`BroadcastSender.${method.name}()`"

            )

        }

packages/SystemUI/checks/src/com/android/internal/systemui/lint/NonInjectedMainThreadDetector.kt

+3 −4
Original line number Diff line number Diff line
@@ -38,10 +38,9 @@ class NonInjectedMainThreadDetector : Detector(), SourceCodeScanner { 
    override fun visitMethodCall(context: JavaContext, node: UCallExpression, method: PsiMethod) {

        if (context.evaluator.isMemberInSubClassOf(method, CLASS_CONTEXT)) {

            context.report(

                ISSUE,

                method,

                context.getNameLocation(node),

                "Replace with injected `@Main Executor`."

                issue = ISSUE,

                location = context.getNameLocation(node),

                message = "Replace with injected `@Main Executor`."

            )

        }

    }

packages/SystemUI/checks/src/com/android/internal/systemui/lint/NonInjectedServiceDetector.kt

+9 −9
Original line number Diff line number Diff line
@@ -44,9 +44,9 @@ class NonInjectedServiceDetector : Detector(), SourceCodeScanner { 
                method.containingClass?.qualifiedName == CLASS_CONTEXT

        ) {

            context.report(

                ISSUE,

                method,

                context.getNameLocation(node),

                issue = ISSUE,

                location = context.getNameLocation(node),

                message =

                    "Use `@Inject` to get system-level service handles instead of " +

                        "`Context.getSystemService()`"

            )
@@ -56,9 +56,9 @@ class NonInjectedServiceDetector : Detector(), SourceCodeScanner { 
                method.containingClass?.qualifiedName == "android.accounts.AccountManager"

        ) {

            context.report(

                ISSUE,

                method,

                context.getNameLocation(node),

                issue = ISSUE,

                location = context.getNameLocation(node),

                message =

                    "Replace `AccountManager.get()` with an injected instance of `AccountManager`"

            )

        }

packages/SystemUI/checks/src/com/android/internal/systemui/lint/RegisterReceiverViaContextDetector.kt

+4 −4
Original line number Diff line number Diff line
@@ -38,10 +38,10 @@ class RegisterReceiverViaContextDetector : Detector(), SourceCodeScanner { 
    override fun visitMethodCall(context: JavaContext, node: UCallExpression, method: PsiMethod) {

        if (context.evaluator.isMemberInSubClassOf(method, CLASS_CONTEXT)) {

            context.report(

                    ISSUE,

                    method,

                    context.getNameLocation(node),

                    "Register `BroadcastReceiver` using `BroadcastDispatcher` instead of `Context`"

                    issue = ISSUE,

                    location = context.getNameLocation(node),

                    message = "Register `BroadcastReceiver` using `BroadcastDispatcher` instead " +

                    "of `Context`"

            )

        }

    }