| commit | 3917d16f3864ccf0514324a0f03438168cf4fd5f | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Mon Jun 13 02:18:32 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 13 02:18:32 2022 +0000 |
| tree | e5c70cb8d2cc1e1d1414160ba8e2e3c236e9d30a | |
| parent | bcaf128ac3c8b437c2e192c78872dd88e2b8246c [diff] | |
| parent | 4185a54ab4ebfb4b2c57af9eb0e98b16a1980dcc [diff] |
Merge "Fix DevSdkIgnoreRule target SDK annotation processing." am: 0588df74e1 Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/2121219 Change-Id: I276d9880e7649952a8ce088542732b8d5ce3d44f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/staticlibs/testutils/devicetests/com/android/testutils/DevSdkIgnoreRule.kt b/staticlibs/testutils/devicetests/com/android/testutils/DevSdkIgnoreRule.kt index 6a073ea..3fcf801 100644 --- a/staticlibs/testutils/devicetests/com/android/testutils/DevSdkIgnoreRule.kt +++ b/staticlibs/testutils/devicetests/com/android/testutils/DevSdkIgnoreRule.kt
@@ -74,7 +74,7 @@ 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 } }