diff options
| author | Raluca Sauciuc <ralucas@google.com> | 2014-10-07 00:32:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-07 00:32:10 +0000 |
| commit | 1cb156bb0160a1474b1703893b6e3e96c407cc5a (patch) | |
| tree | c173488eaf6735be483ff771f35e3adcadd382ed /test-runner | |
| parent | 84527eca759495b4a5514edbea9a56b907992a42 (diff) | |
| parent | f35c305f45db60394c3c7fec2e41b38963da70ca (diff) | |
| download | frameworks_base-1cb156bb0160a1474b1703893b6e3e96c407cc5a.zip frameworks_base-1cb156bb0160a1474b1703893b6e3e96c407cc5a.tar.gz frameworks_base-1cb156bb0160a1474b1703893b6e3e96c407cc5a.tar.bz2 | |
am f35c305f: am 6a3faf5a: Merge "Fix test framework to allow Mockito tests to run successfully on ART." into lmp-dev
* commit 'f35c305f45db60394c3c7fec2e41b38963da70ca':
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. " |