Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c21eaba6 authored by Raluca Sauciuc's avatar Raluca Sauciuc Committed by Android Git Automerger
Browse files

am 6a3faf5a: Merge "Fix test framework to allow Mockito tests to run... 

am 6a3faf5a: Merge "Fix test framework to allow Mockito tests to run successfully on ART." into lmp-dev

* commit '6a3faf5a':
  Fix test framework to allow Mockito tests to run successfully on ART.
parents 704c3b90 6a3faf5a

test-runner/src/android/test/ClassPathPackageInfoSource.java

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ public class ClassPathPackageInfoSource { 
                // We get errors in the emulator if we don't use the caller's class loader.

                topLevelClasses.add(Class.forName(className, false,

                        (classLoader != null) ? classLoader : CLASS_LOADER));

            } catch (ClassNotFoundException e) {

            } catch (ClassNotFoundException | NoClassDefFoundError e) {

                // Should not happen unless there is a generated class that is not included in

                // the .apk.

                Log.w("ClassPathPackageInfoSource", "Cannot load class. "