commit d9ef072667c52c79c019cc8e96862360ccd3e13f
author Matt Banda <mbanda@google.com> Wed May 26 19:31:21 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed May 26 19:31:21 2021 +0000
tree e0df5e8ec0c4c9394b6399a8608535eaa55819f6
parent 71342fd461d3982fb8f9d4be0e2d188dc3eef9d8
parent 1511c56b66ed0d95c58b06c094a8bce7a0d53a03

Changes Java/Kotlin AndroidLint API Finder check to also detect Protected methods. am: 9eccc1ae92 am: 1511c56b66

Original change: https://android-review.googlesource.com/c/platform/tools/apifinder/+/1718270

Change-Id: Ic132d702e4cb03356db4fa7446fba7e6881f7238

checks/src/main/java/com/android/apifinder/ApiFinderDetector.kt

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