commit 2a5f0df5b0e0528a50ca6318b619a5278d5c31be
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Apr 08 16:05:00 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Apr 08 16:05:00 2022 +0000
tree 5c14bce39837a5206f815f21f3ecbad966eecca0
parent 5d0e83307d45e3f8f193d5d31eece998bef83ae5
parent 751ff5955c7a57c5c391c5f7abb4a6b509ff8aea

Snap for 8426163 from 751ff5955c7a57c5c391c5f7abb4a6b509ff8aea to mainline-tzdata2-release

Change-Id: I498b0d1bf84eb9968ab562c4222bfc713db464dc

Android.bp

diff --git a/Android.bp b/Android.bp
index c5897b9..6d9eec3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,10 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
 java_plugin {
     name: "java_api_finder",
 
@@ -31,14 +27,11 @@
 
     static_libs: [
         "//external/error_prone:error_prone_core",
-    ],
-
-    libs: [
-        "//external/auto:auto_service_annotations",
+        "//external/dagger2:dagger2-auto-service",
     ],
 
     plugins: [
-        "//external/auto:auto_service_plugin",
+        "//external/dagger2:dagger2-auto-service",
     ],
 
     javacflags: ["-verbose"],
@@ -56,11 +49,7 @@
         "hamcrest",
         "platform-test-annotations",
         "junit",
-        "truth-prebuilt",
     ],
-    test_options: {
-        unit_test: true,
-    },
 }
 
 filegroup {
@@ -74,9 +63,9 @@
 java_library_host {
     name: "JavaKotlinApiFinder",
     srcs: ["checks/src/main/java/**/*.kt"],
-    plugins: ["auto_service_plugin"],
+    plugins: ["dagger2-auto-service"],
     libs: [
-        "auto_service_annotations",
+        "dagger2-auto-service-annotations",
         "lint_api",
     ],
 }

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 5132fcf..1c72a83 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/protected calls.
-              if (!method.hasModifier(JvmModifier.PUBLIC) && !method.hasModifier(JvmModifier.PROTECTED)) {
+              // Exclude non-public calls.
+              if (!method.hasModifier(JvmModifier.PUBLIC)) {
                   return
               }
               var containingClass = method.containingClass
               while (containingClass != null) {
-                  if (!containingClass.hasModifier(JvmModifier.PUBLIC) && !containingClass.hasModifier(JvmModifier.PROTECTED)) {
+                  if (!containingClass.hasModifier(JvmModifier.PUBLIC)) {
                       return
                   }
                   containingClass = containingClass.containingClass