Skip to content

Catch LinkageError in addition to ClassNotFoundErrors. #2494

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −2
Open

Catch LinkageError in addition to ClassNotFoundErrors. #2494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions runner/android_junit_runner/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

**Bug Fixes**

* Catch LinkageError when loading annotation classes (b/536117227)

**New Features**

* Make perfetto trace sections for tests more identifiable by prefixing with "test:" and using fully qualified class name. (b/204992764)
Expand Down
4 changes: 2 additions & 2 deletions runner/android_junit_runner/java/androidx/test/internal/runner/TestRequestBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ private void maybeAddLegacySuppressFilter() {
(Class<? extends Annotation>)
Class.forName("android.test.suitebuilder.annotation.Suppress");
filter = filter.intersect(new AnnotationExclusionFilter(legacySuppressClass));
} catch (ClassNotFoundException e) {
} catch (ClassNotFoundException | LinkageError e) {
// ignore
}
}
Expand Down Expand Up @@ -817,7 +817,7 @@ private Class<? extends Annotation> loadAnnotationClass(String className) {
try {
Class<?> clazz = Class.forName(className);
return (Class<? extends Annotation>) clazz;
} catch (ClassNotFoundException e) {
} catch (ClassNotFoundException | LinkageError e) {
Log.e(TAG, String.format("Could not find annotation class: %s", className));
} catch (ClassCastException e) {
Log.e(TAG, String.format("Class %s is not an annotation", className));
Expand Down
Loading