From a859687b0da5f0aca66e44ccfd59ebd82b338215 Mon Sep 17 00:00:00 2001 From: mattgilbride Date: Mon, 12 Dec 2022 20:05:35 +0000 Subject: [PATCH] Remove global issues from AndroidFrameworkLintChecker Now that AndroidGlobalLintChecker runs globally (I2a868f1d78c969eefa2c29477fc8ecab1043df39), remove the issues from AndroidFrameworkIssueRegistry that are duplicated in AndroidGlobalIssueRegistry. Bug: 236558918 Test: TH Change-Id: I4c7c1057b99e0a5a910c62b37606569794e68e1d --- tools/lint/framework/Android.bp | 2 -- .../google/android/lint/AndroidFrameworkIssueRegistry.kt | 7 ------- 2 files changed, 9 deletions(-) diff --git a/tools/lint/framework/Android.bp b/tools/lint/framework/Android.bp index 7f27e8a57d19e..b7525030adc4a 100644 --- a/tools/lint/framework/Android.bp +++ b/tools/lint/framework/Android.bp @@ -31,8 +31,6 @@ java_library_host { ], static_libs: [ "AndroidCommonLint", - // TODO: remove once b/236558918 is resolved and the below checks actually run globally - "AndroidGlobalLintChecker", ], kotlincflags: ["-Xjvm-default=all"], } diff --git a/tools/lint/framework/checks/src/main/java/com/google/android/lint/AndroidFrameworkIssueRegistry.kt b/tools/lint/framework/checks/src/main/java/com/google/android/lint/AndroidFrameworkIssueRegistry.kt index c5cf0fb2f9631..423a6843891e1 100644 --- a/tools/lint/framework/checks/src/main/java/com/google/android/lint/AndroidFrameworkIssueRegistry.kt +++ b/tools/lint/framework/checks/src/main/java/com/google/android/lint/AndroidFrameworkIssueRegistry.kt @@ -19,9 +19,6 @@ package com.google.android.lint import com.android.tools.lint.client.api.IssueRegistry import com.android.tools.lint.client.api.Vendor import com.android.tools.lint.detector.api.CURRENT_API -import com.google.android.lint.aidl.EnforcePermissionDetector -import com.google.android.lint.aidl.EnforcePermissionHelperDetector -import com.google.android.lint.aidl.SimpleManualPermissionEnforcementDetector import com.google.android.lint.parcel.SaferParcelChecker import com.google.auto.service.AutoService @@ -37,10 +34,6 @@ class AndroidFrameworkIssueRegistry : IssueRegistry() { CallingIdentityTokenDetector.ISSUE_CLEAR_IDENTITY_CALL_NOT_FOLLOWED_BY_TRY_FINALLY, CallingIdentityTokenDetector.ISSUE_RESULT_OF_CLEAR_IDENTITY_CALL_NOT_STORED_IN_VARIABLE, CallingSettingsNonUserGetterMethodsDetector.ISSUE_NON_USER_GETTER_CALLED, - EnforcePermissionDetector.ISSUE_MISSING_ENFORCE_PERMISSION, - EnforcePermissionDetector.ISSUE_MISMATCHING_ENFORCE_PERMISSION, - EnforcePermissionHelperDetector.ISSUE_ENFORCE_PERMISSION_HELPER, - SimpleManualPermissionEnforcementDetector.ISSUE_SIMPLE_MANUAL_PERMISSION_ENFORCEMENT, SaferParcelChecker.ISSUE_UNSAFE_API_USAGE, PackageVisibilityDetector.ISSUE_PACKAGE_NAME_NO_PACKAGE_VISIBILITY_FILTERS, RegisterReceiverFlagDetector.ISSUE_RECEIVER_EXPORTED_FLAG,