Merge "Handle another case of exceptions of type 'Error' when accessing members through JNI." into android12L-tests-dev

Author: Treehugger Robot

tests/signature/lib/android/src/android/signature/cts/DexMemberChecker.java

@@ -98,9 +98,7 @@ public static void checkSingleMember(DexMember dexMember, boolean reflection, bo
                 try {
                     observer.fieldAccessibleViaJni(hasMatchingField_JNI(klass, field), field);
                 } catch (ClassNotFoundException | Error e) {
-                    if ((e instanceof NoClassDefFoundError)
-                            && !(e.getCause() instanceof ExceptionInInitializerError)
-                            && !(e.getCause() instanceof UnsatisfiedLinkError)) {
+                    if ((e instanceof NoClassDefFoundError) && !(e.getCause() instanceof Error)) {
                         throw (NoClassDefFoundError) e;
                     }