diff options
| author | Raluca Sauciuc <ralucas@google.com> | 2014-10-07 00:55:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-07 00:55:52 +0000 |
| commit | b81889f54ec297aba82ac8110c9983966d2bf9a6 (patch) | |
| tree | 640a5e4cc060535dee9f00e49d80a0e5b07a7a97 /test-runner | |
| parent | 7f1146084b6caa3fa73a08968214868682e7833c (diff) | |
| parent | 59f7c4c749fb69c9f83a3d28784147a941fecc58 (diff) | |
| download | frameworks_base-b81889f54ec297aba82ac8110c9983966d2bf9a6.zip frameworks_base-b81889f54ec297aba82ac8110c9983966d2bf9a6.tar.gz frameworks_base-b81889f54ec297aba82ac8110c9983966d2bf9a6.tar.bz2 | |
am 59f7c4c7: am 1cb156bb: am f35c305f: am 6a3faf5a: Merge "Fix test framework to allow Mockito tests to run successfully on ART." into lmp-dev
* commit '59f7c4c749fb69c9f83a3d28784147a941fecc58':
Fix test framework to allow Mockito tests to run successfully on ART.
Diffstat (limited to 'test-runner')
| -rw-r--r-- | test-runner/src/android/test/ClassPathPackageInfoSource.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test-runner/src/android/test/ClassPathPackageInfoSource.java b/test-runner/src/android/test/ClassPathPackageInfoSource.java index 7b10e38..0ffecdb 100644 --- a/test-runner/src/android/test/ClassPathPackageInfoSource.java +++ b/test-runner/src/android/test/ClassPathPackageInfoSource.java @@ -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. " |