commit b09ae96607cdb5809c7906e8c77a157b51f4a56e
author android-build-team Robot <android-build-team-robot@google.com> Thu Jun 10 01:14:03 2021 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Jun 10 01:14:03 2021 +0000
tree e0df5e8ec0c4c9394b6399a8608535eaa55819f6
parent ff20a396a4e7f721745b05f870b4cf59cd1906ed
parent c5d722a95b11c4e586853cde1fe68eb0e961e228

Snap for 7444394 from c5d722a95b11c4e586853cde1fe68eb0e961e228 to sc-release

Change-Id: Icc53fe6711a9da00220ae56799f517e2478289c8

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