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

Commit 69178b33 authored by mattgilbride's avatar mattgilbride Committed by Matt Gilbride
Browse files

Conditionally report SimpleManualPermissionEnforcement lint as ERROR 

Certain manual permission checks in AIDL implementations can be replaced
with the @EnforcePermission annotation in a behavior perserving way.
When this is the case, the linter will now report at ERROR severity
This will break the errorprone build, reminding the author to use the
annotation instead.

Bug: 265014041
Test: TH, manually tested with local changes to linter
Change-Id: I9fedd9d9fae19dd7126fa5cc4c410ccf775e0d8a
parent 50fe8c61

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

+3 −4
Original line number Diff line number Diff line
@@ -53,10 +53,9 @@ class SimpleManualPermissionEnforcementDetector : AidlImplementationDetector() { 
                lintFix

        )



        // TODO(b/265014041): turn on errors once all code that would cause one is fixed

        // if (enforcePermissionFix.errorLevel) {

        //     incident.overrideSeverity(Severity.ERROR)

        // }

        if (enforcePermissionFix.errorLevel) {

            incident.overrideSeverity(Severity.ERROR)

        }



        context.report(incident)

    }

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

+16 −16
Original line number Diff line number Diff line
@@ -51,10 +51,10 @@ class SimpleManualPermissionEnforcementDetectorTest : LintDetectorTest() { 
            .run()

            .expect(

                """

                src/Foo.java:7: Warning: ITest permission check should be converted to @EnforcePermission annotation [SimpleManualPermissionEnforcement]

                src/Foo.java:7: Error: ITest permission check should be converted to @EnforcePermission annotation [SimpleManualPermissionEnforcement]

                        mContext.enforceCallingOrSelfPermission("android.permission.READ_CONTACTS", "foo");

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

                0 errors, 1 warnings

                1 errors, 0 warnings

                """

            )

            .expectFixDiffs(
@@ -168,10 +168,10 @@ class SimpleManualPermissionEnforcementDetectorTest : LintDetectorTest() { 
            .run()

            .expect(

                """

                src/Foo.java:8: Warning: ITest permission check should be converted to @EnforcePermission annotation [SimpleManualPermissionEnforcement]

                src/Foo.java:8: Error: ITest permission check should be converted to @EnforcePermission annotation [SimpleManualPermissionEnforcement]

                            mContext.enforceCallingOrSelfPermission(

                            ^

                0 errors, 1 warnings

                1 errors, 0 warnings

                """

            )

            .expectFixDiffs(
@@ -209,10 +209,10 @@ class SimpleManualPermissionEnforcementDetectorTest : LintDetectorTest() { 
            .run()

            .expect(

                """

                src/Foo.java:8: Warning: ITest permission check should be converted to @EnforcePermission annotation [SimpleManualPermissionEnforcement]

                src/Foo.java:8: Error: ITest permission check should be converted to @EnforcePermission annotation [SimpleManualPermissionEnforcement]

                        mContext.enforceCallingOrSelfPermission(android.Manifest.permission.READ_CONTACTS, "foo");

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

                0 errors, 1 warnings

                1 errors, 0 warnings

                """

            )

            .expectFixDiffs(
@@ -252,10 +252,10 @@ class SimpleManualPermissionEnforcementDetectorTest : LintDetectorTest() { 
            .run()

            .expect(

                """

                src/Foo.java:10: Warning: ITest permission check should be converted to @EnforcePermission annotation [SimpleManualPermissionEnforcement]

                src/Foo.java:10: Error: ITest permission check should be converted to @EnforcePermission annotation [SimpleManualPermissionEnforcement]

                            mContext.enforceCallingOrSelfPermission(

                            ^

                0 errors, 1 warnings

                1 errors, 0 warnings

                """

            )

            .expectFixDiffs(
@@ -414,10 +414,10 @@ class SimpleManualPermissionEnforcementDetectorTest : LintDetectorTest() { 
            .run()

            .expect(

                """

                src/Foo.java:14: Warning: ITest permission check should be converted to @EnforcePermission annotation [SimpleManualPermissionEnforcement]

                src/Foo.java:14: Error: ITest permission check should be converted to @EnforcePermission annotation [SimpleManualPermissionEnforcement]

                        helper();

                        ~~~~~~~~~

                0 errors, 1 warnings

                1 errors, 0 warnings

                """

            )

            .expectFixDiffs(
@@ -506,10 +506,10 @@ class SimpleManualPermissionEnforcementDetectorTest : LintDetectorTest() { 
            .run()

            .expect(

                """

                src/Foo.java:16: Warning: ITest permission check should be converted to @EnforcePermission annotation [SimpleManualPermissionEnforcement]

                src/Foo.java:16: Error: ITest permission check should be converted to @EnforcePermission annotation [SimpleManualPermissionEnforcement]

                        mContext.enforceCallingOrSelfPermission("FOO", "foo");

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

                0 errors, 1 warnings

                1 errors, 0 warnings

                """

            )

            .expectFixDiffs(
@@ -558,10 +558,10 @@ class SimpleManualPermissionEnforcementDetectorTest : LintDetectorTest() { 
            .run()

            .expect(

                """

                src/Foo.java:19: Warning: ITest permission check should be converted to @EnforcePermission annotation [SimpleManualPermissionEnforcement]

                src/Foo.java:19: Error: ITest permission check should be converted to @EnforcePermission annotation [SimpleManualPermissionEnforcement]

                        helperHelper();

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

                0 errors, 1 warnings

                1 errors, 0 warnings

                """

            )

            .expectFixDiffs(
@@ -599,10 +599,10 @@ class SimpleManualPermissionEnforcementDetectorTest : LintDetectorTest() { 
                .run()

                .expect(

                    """

                    src/Foo.java:7: Warning: ITest permission check should be converted to @EnforcePermission annotation [SimpleManualPermissionEnforcement]

                    src/Foo.java:7: Error: ITest permission check should be converted to @EnforcePermission annotation [SimpleManualPermissionEnforcement]

                            if (mContext.checkCallingOrSelfPermission("android.permission.READ_CONTACTS", "foo")

                            ^

                    0 errors, 1 warnings

                    1 errors, 0 warnings

                    """

                )

                .expectFixDiffs(