From f0de8d34a3ac66a9b2fd7dd6c0beb9ebd979f1e6 Mon Sep 17 00:00:00 2001 From: Azhara Assanova Date: Mon, 19 Jul 2021 10:30:18 +0000 Subject: [PATCH] Rename AndroidFrameworkLintChecker's package to com.google.android.lint The previous package name com.android.lint is not allowed for custom lint checks because lint thinks any package with com.android. is its own API, so it performs a reflection check to see if it is a known API, but it fails because it is a custom check. For testing, verify that the lint report does not report an Obsolete Custom Lint Check issue. Bug: 192870410 Test: m out/soong/.intermediates/frameworks/base/services/autofill/services.autofill/android_common/lint/lint-report.html Change-Id: I4970d230329a2ab48ec1c0152d824995fa005127 --- .../lint/CallingIdentityTokenDetector.kt | 28 +++++++++---------- .../lint/CallingIdentityTokenIssueRegistry.kt | 16 +++++------ .../lint/CallingIdentityTokenDetectorTest.kt | 2 +- 3 files changed, 22 insertions(+), 24 deletions(-) rename tools/lint/checks/src/main/java/com/{ => google}/android/lint/CallingIdentityTokenDetector.kt (90%) rename tools/lint/checks/src/main/java/com/{ => google}/android/lint/CallingIdentityTokenIssueRegistry.kt (96%) rename tools/lint/checks/src/test/java/com/{ => google}/android/lint/CallingIdentityTokenDetectorTest.kt (99%) diff --git a/tools/lint/checks/src/main/java/com/android/lint/CallingIdentityTokenDetector.kt b/tools/lint/checks/src/main/java/com/google/android/lint/CallingIdentityTokenDetector.kt similarity index 90% rename from tools/lint/checks/src/main/java/com/android/lint/CallingIdentityTokenDetector.kt rename to tools/lint/checks/src/main/java/com/google/android/lint/CallingIdentityTokenDetector.kt index a41d65d7ea3ae..b5cab99b4e527 100644 --- a/tools/lint/checks/src/main/java/com/android/lint/CallingIdentityTokenDetector.kt +++ b/tools/lint/checks/src/main/java/com/google/android/lint/CallingIdentityTokenDetector.kt @@ -14,21 +14,21 @@ * limitations under the License. */ -package com.android.lint +package com.google.android.lint -import com.android.lint.CallingIdentityTokenIssueRegistry.Companion.ISSUE_CLEAR_IDENTITY_CALL_NOT_FOLLOWED_BY_TRY_FINALLY -import com.android.lint.CallingIdentityTokenIssueRegistry.Companion.ISSUE_NESTED_CLEAR_IDENTITY_CALLS -import com.android.lint.CallingIdentityTokenIssueRegistry.Companion.ISSUE_NON_FINAL_TOKEN -import com.android.lint.CallingIdentityTokenIssueRegistry.Companion.ISSUE_RESTORE_IDENTITY_CALL_NOT_IN_FINALLY_BLOCK -import com.android.lint.CallingIdentityTokenIssueRegistry.Companion.ISSUE_UNUSED_TOKEN -import com.android.lint.CallingIdentityTokenIssueRegistry.Companion.ISSUE_USE_OF_CALLER_AWARE_METHODS_WITH_CLEARED_IDENTITY -import com.android.lint.CallingIdentityTokenIssueRegistry.Companion.getIncidentMessageClearIdentityCallNotFollowedByTryFinally -import com.android.lint.CallingIdentityTokenIssueRegistry.Companion.getIncidentMessageNestedClearIdentityCallsPrimary -import com.android.lint.CallingIdentityTokenIssueRegistry.Companion.getIncidentMessageNestedClearIdentityCallsSecondary -import com.android.lint.CallingIdentityTokenIssueRegistry.Companion.getIncidentMessageNonFinalToken -import com.android.lint.CallingIdentityTokenIssueRegistry.Companion.getIncidentMessageRestoreIdentityCallNotInFinallyBlock -import com.android.lint.CallingIdentityTokenIssueRegistry.Companion.getIncidentMessageUnusedToken -import com.android.lint.CallingIdentityTokenIssueRegistry.Companion.getIncidentMessageUseOfCallerAwareMethodsWithClearedIdentity +import com.google.android.lint.CallingIdentityTokenIssueRegistry.Companion.ISSUE_CLEAR_IDENTITY_CALL_NOT_FOLLOWED_BY_TRY_FINALLY +import com.google.android.lint.CallingIdentityTokenIssueRegistry.Companion.ISSUE_NESTED_CLEAR_IDENTITY_CALLS +import com.google.android.lint.CallingIdentityTokenIssueRegistry.Companion.ISSUE_NON_FINAL_TOKEN +import com.google.android.lint.CallingIdentityTokenIssueRegistry.Companion.ISSUE_RESTORE_IDENTITY_CALL_NOT_IN_FINALLY_BLOCK +import com.google.android.lint.CallingIdentityTokenIssueRegistry.Companion.ISSUE_UNUSED_TOKEN +import com.google.android.lint.CallingIdentityTokenIssueRegistry.Companion.ISSUE_USE_OF_CALLER_AWARE_METHODS_WITH_CLEARED_IDENTITY +import com.google.android.lint.CallingIdentityTokenIssueRegistry.Companion.getIncidentMessageClearIdentityCallNotFollowedByTryFinally +import com.google.android.lint.CallingIdentityTokenIssueRegistry.Companion.getIncidentMessageNestedClearIdentityCallsPrimary +import com.google.android.lint.CallingIdentityTokenIssueRegistry.Companion.getIncidentMessageNestedClearIdentityCallsSecondary +import com.google.android.lint.CallingIdentityTokenIssueRegistry.Companion.getIncidentMessageNonFinalToken +import com.google.android.lint.CallingIdentityTokenIssueRegistry.Companion.getIncidentMessageRestoreIdentityCallNotInFinallyBlock +import com.google.android.lint.CallingIdentityTokenIssueRegistry.Companion.getIncidentMessageUnusedToken +import com.google.android.lint.CallingIdentityTokenIssueRegistry.Companion.getIncidentMessageUseOfCallerAwareMethodsWithClearedIdentity import com.android.tools.lint.client.api.UElementHandler import com.android.tools.lint.detector.api.Context import com.android.tools.lint.detector.api.Detector diff --git a/tools/lint/checks/src/main/java/com/android/lint/CallingIdentityTokenIssueRegistry.kt b/tools/lint/checks/src/main/java/com/google/android/lint/CallingIdentityTokenIssueRegistry.kt similarity index 96% rename from tools/lint/checks/src/main/java/com/android/lint/CallingIdentityTokenIssueRegistry.kt rename to tools/lint/checks/src/main/java/com/google/android/lint/CallingIdentityTokenIssueRegistry.kt index 1bd63ea17374f..8a747b64c3a4f 100644 --- a/tools/lint/checks/src/main/java/com/android/lint/CallingIdentityTokenIssueRegistry.kt +++ b/tools/lint/checks/src/main/java/com/google/android/lint/CallingIdentityTokenIssueRegistry.kt @@ -14,11 +14,10 @@ * limitations under the License. */ -package com.android.lint +package com.google.android.lint import com.android.tools.lint.client.api.IssueRegistry -// TODO: uncomment when lint API in Soong becomes 30.0+ -// import com.android.tools.lint.client.api.Vendor +import com.android.tools.lint.client.api.Vendor import com.android.tools.lint.detector.api.CURRENT_API import com.android.tools.lint.detector.api.Category import com.android.tools.lint.detector.api.Implementation @@ -45,12 +44,11 @@ class CallingIdentityTokenIssueRegistry : IssueRegistry() { override val minApi: Int get() = 8 -// TODO: uncomment when lint API in Soong becomes 30.0+ -// override val vendor: Vendor = Vendor( -// vendorName = "Android Open Source Project", -// feedbackUrl = "http://b/issues/new?component=315013", -// contact = "brufino@google.com" -// ) + override val vendor: Vendor = Vendor( + vendorName = "Android", + feedbackUrl = "http://b/issues/new?component=315013", + contact = "brufino@google.com" + ) companion object { /** Issue: unused token from Binder.clearCallingIdentity() */ diff --git a/tools/lint/checks/src/test/java/com/android/lint/CallingIdentityTokenDetectorTest.kt b/tools/lint/checks/src/test/java/com/google/android/lint/CallingIdentityTokenDetectorTest.kt similarity index 99% rename from tools/lint/checks/src/test/java/com/android/lint/CallingIdentityTokenDetectorTest.kt rename to tools/lint/checks/src/test/java/com/google/android/lint/CallingIdentityTokenDetectorTest.kt index 0fd1a7621238f..8d12050cae1a4 100644 --- a/tools/lint/checks/src/test/java/com/android/lint/CallingIdentityTokenDetectorTest.kt +++ b/tools/lint/checks/src/test/java/com/google/android/lint/CallingIdentityTokenDetectorTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.lint +package com.google.android.lint import com.android.tools.lint.checks.infrastructure.LintDetectorTest import com.android.tools.lint.checks.infrastructure.TestFile