commit | 511638b7a7e7512a8c9538ecf96b44c6e6467d98 | [log] [tgz] |
---|---|---|
author | Matt Banda <mbanda@google.com> | Tue Jun 08 22:22:12 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 08 22:22:12 2021 +0000 |
tree | e0df5e8ec0c4c9394b6399a8608535eaa55819f6 | |
parent | 71342fd461d3982fb8f9d4be0e2d188dc3eef9d8 [diff] | |
parent | c5d722a95b11c4e586853cde1fe68eb0e961e228 [diff] |
Changes Java/Kotlin AndroidLint API Finder check to also detect Protected methods. am: 9eccc1ae92 am: 1511c56b66 am: d9ef072667 am: bda4cc1c8f am: c5d722a95b Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/apifinder/+/14888438 Change-Id: I04dffd6715d157a0932255021569ad9b0c6ef67b
diff --git a/checks/src/main/java/com/android/apifinder/ApiFinderDetector.kt b/checks/src/main/java/com/android/apifinder/ApiFinderDetector.kt index 1c72a83..5132fcf 100644 --- a/checks/src/main/java/com/android/apifinder/ApiFinderDetector.kt +++ b/checks/src/main/java/com/android/apifinder/ApiFinderDetector.kt
@@ -41,13 +41,13 @@ private fun visitGenericMethod( method: PsiMethod, node: UElement, isModuleMethod: Boolean = false ) { - // Exclude non-public calls. - if (!method.hasModifier(JvmModifier.PUBLIC)) { + // Exclude non-public/protected calls. + if (!method.hasModifier(JvmModifier.PUBLIC) && !method.hasModifier(JvmModifier.PROTECTED)) { return } var containingClass = method.containingClass while (containingClass != null) { - if (!containingClass.hasModifier(JvmModifier.PUBLIC)) { + if (!containingClass.hasModifier(JvmModifier.PUBLIC) && !containingClass.hasModifier(JvmModifier.PROTECTED)) { return } containingClass = containingClass.containingClass