summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2022-06-13 09:13:20 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-06-13 09:13:20 +0000
commit78eed8e86b4b8fd7af372a096f00d738f05c1157 (patch)
treea759a4c1f4c17ef1dcd48ef8bdc814cded6f0fdc
parent5014bdb07ca3341a97003099a0f65fe6e17b4963 (diff)
parent9e1d0907154f0d7193abaeef016a83330888480b (diff)
Fix DevSdkIgnoreRule target SDK annotation processing. am: 9e1d090715
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/net/+/18807155 Change-Id: Ia06ca5adf3fbf852b52f5a4fb65a4a5c655075a0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--common/testutils/devicetests/com/android/testutils/DevSdkIgnoreRule.kt2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/testutils/devicetests/com/android/testutils/DevSdkIgnoreRule.kt b/common/testutils/devicetests/com/android/testutils/DevSdkIgnoreRule.kt
index 6a073ea..3fcf801 100644
--- a/common/testutils/devicetests/com/android/testutils/DevSdkIgnoreRule.kt
+++ b/common/testutils/devicetests/com/android/testutils/DevSdkIgnoreRule.kt
@@ -74,7 +74,7 @@ private fun isDevSdkUpTo(maxInclusive: Int): Boolean {
private fun getMaxTargetSdk(description: Description): Int? {
return description.annotations.firstNotNullOfOrNull {
- MAX_TARGET_SDK_ANNOTATION_RE.matcher(it::class.simpleName).let { m ->
+ MAX_TARGET_SDK_ANNOTATION_RE.matcher(it.annotationClass.simpleName).let { m ->
if (m.find()) m.group(1).toIntOrNull() else null
}
}