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

Commit 74323a74 authored by Tudor Măgirescu's avatar Tudor Măgirescu Committed by Automerger Merge Worker
Browse files

Merge "Update exemptAidlInterfaces and PermissionAnnotationDetector's message"... 

Merge "Update exemptAidlInterfaces and PermissionAnnotationDetector's message" into main am: b5bd3c2c am: 35fcad85

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



Change-Id: Ib0eb90f8b4d153cfc9ba2cf0d20cee242c49a397
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 24484f8e 35fcad85

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

+2 −3
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ val exemptAidlInterfaces = setOf( 
    "android.devicelock.IGetDeviceIdCallback",

    "android.devicelock.IGetKioskAppsCallback",

    "android.devicelock.IIsDeviceLockedCallback",

    "android.devicelock.IVoidResultCallback",

    "android.devicelock.ILockUnlockDeviceCallback",

    "android.federatedcompute.aidl.IExampleStoreCallback",

    "android.federatedcompute.aidl.IExampleStoreIterator",

    "android.federatedcompute.aidl.IExampleStoreIteratorCallback",
@@ -364,8 +364,6 @@ val exemptAidlInterfaces = setOf( 
    "android.health.connect.aidl.IGetPriorityResponseCallback",

    "android.health.connect.aidl.IHealthConnectService",

    "android.health.connect.aidl.IInsertRecordsResponseCallback",

    "android.health.connect.aidl.IMedicalDataSourceResponseCallback",

    "android.health.connect.aidl.IMedicalResourcesResponseCallback",

    "android.health.connect.aidl.IMigrationCallback",

    "android.health.connect.aidl.IReadMedicalResourcesResponseCallback",

    "android.health.connect.aidl.IReadRecordsResponseCallback",
@@ -462,6 +460,7 @@ val exemptAidlInterfaces = setOf( 
    "android.net.ipmemorystore.IOnBlobRetrievedListener",

    "android.net.ipmemorystore.IOnL2KeyResponseListener",

    "android.net.ipmemorystore.IOnNetworkAttributesRetrievedListener",

    "android.net.ipmemorystore.IOnNetworkEventCountRetrievedListener",

    "android.net.ipmemorystore.IOnSameL3NetworkResponseListener",

    "android.net.ipmemorystore.IOnStatusAndCountListener",

    "android.net.ipmemorystore.IOnStatusListener",

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

+4 −1
Original line number Diff line number Diff line
@@ -57,7 +57,10 @@ class PermissionAnnotationDetector : AidlImplementationDetector() { 
            ISSUE_MISSING_PERMISSION_ANNOTATION,

            node,

            context.getLocation(node),

            "The method ${node.name} is not permission-annotated."

            """

                ${node.name} should be annotated with either @EnforcePermission, \

                @RequiresNoPermission or @PermissionManuallyEnforced.

            """.trimMargin()

        )

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ class PermissionAnnotationDetectorTest : LintDetectorTest() { 
            .run()

            .expect(

                """

                src/frameworks/base/services/java/com/android/server/Bar.java:3: Error: The method testMethod is not permission-annotated. [MissingPermissionAnnotation]

                src/frameworks/base/services/java/com/android/server/Bar.java:3: Error: testMethod should be annotated with either @EnforcePermission, @RequiresNoPermission or @PermissionManuallyEnforced. [MissingPermissionAnnotation]

                    public void testMethod(int parameter1, int parameter2) { }

                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

                1 errors, 0 warnings