diff options
| author | Raluca Sauciuc <ralucas@google.com> | 2014-10-06 23:19:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-06 23:19:12 +0000 |
| commit | 6a3faf5a8b182d20dea47fb76cf33456321ddf7a (patch) | |
| tree | c491d24db64d6fc85873adb6e286e93ac1cbaedc | |
| parent | 7627d2cd5cd93ebf8e683392edbef961dbc20d31 (diff) | |
| parent | 0180dfeff341639011ce005a6707c9dc3b55f5df (diff) | |
| download | frameworks_base-6a3faf5a8b182d20dea47fb76cf33456321ddf7a.zip frameworks_base-6a3faf5a8b182d20dea47fb76cf33456321ddf7a.tar.gz frameworks_base-6a3faf5a8b182d20dea47fb76cf33456321ddf7a.tar.bz2 | |
Merge "Fix test framework to allow Mockito tests to run successfully on ART." into lmp-dev
| -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. " |