drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'f35c305f45db60394c3c7fec2e41b38963da70ca':
  Fix test framework to allow Mockito tests to run successfully on ART.
This commit is contained in:
Raluca Sauciuc
2014-10-07 00:32:10 +00:00
committed by Android Git Automerger
parent 84527eca75 f35c305f45
commit 1cb156bb01
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test-runner/src/android/test/ClassPathPackageInfoSource.java
View File

@ -87,7 +87,7 @@ public class ClassPathPackageInfoSource {
// We get errors in the emulator if we don't use the caller's class loader. // We get errors in the emulator if we don't use the caller's class loader.
topLevelClasses.add(Class.forName(className, false, topLevelClasses.add(Class.forName(className, false,
(classLoader != null) ? classLoader : CLASS_LOADER)); (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 // Should not happen unless there is a generated class that is not included in
// the .apk. // the .apk.
Log.w("ClassPathPackageInfoSource", "Cannot load class. " Log.w("ClassPathPackageInfoSource", "Cannot load class. "