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

Commit d8f94cbc authored by Thiébaud Weksteen's avatar Thiébaud Weksteen Committed by Automerger Merge Worker
Browse files

Merge changes I04c68e95,I9ab2b654,Ic0104961 into main am: c0857666 am: b43e012f am: ca63ab9a 

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



Change-Id: I49bb3085fb85064a49766e06788941c5cb4db16e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0e9201d9 ca63ab9a

tools/lint/global/checks/src/main/java/com/google/android/lint/aidl/EnforcePermissionDetector.kt

+9 −0
Original line number Original line Diff line number Diff line
@@ -197,6 +197,15 @@ class EnforcePermissionDetector : Detector(), SourceCodeScanner { 
            /* Check that we are connected to the super class */

            /* Check that we are connected to the super class */

            val overridingMethod = node as PsiMethod

            val overridingMethod = node as PsiMethod

            val parents = overridingMethod.findSuperMethods()

            val parents = overridingMethod.findSuperMethods()

            if (parents.isEmpty()) {

                context.report(

                    ISSUE_MISUSING_ENFORCE_PERMISSION,

                    node,

                    context.getLocation(node),

                    "The method ${node.name} does not override an AIDL generated method"

                )

                return

            }

            for (overriddenMethod in parents) {

            for (overriddenMethod in parents) {

                // The equivalence check can be skipped, if both methods are

                // The equivalence check can be skipped, if both methods are

                // annotated, it will be verified by visitAnnotationUsage.

                // annotated, it will be verified by visitAnnotationUsage.

tools/lint/global/checks/src/test/java/com/google/android/lint/aidl/EnforcePermissionDetectorTest.kt

+118 −73

File changed.

Preview size limit exceeded, changes collapsed.

tools/lint/global/checks/src/test/java/com/google/android/lint/aidl/EnforcePermissionHelperDetectorCodegenTest.kt

+2 −1

File changed.

Preview size limit exceeded, changes collapsed.