Merge "Fix DexmakerMockMaker to filter out Reflection calls" am: a494e0736c am: 99fb8e677d am: 96820348f9
am: e12c014d39
Change-Id: Idca0eae7dc77378ad3b83ad8a5eb09b5936649f1
diff --git a/README.version b/README.version
index 7f7d2c2..0fb9575 100644
--- a/README.version
+++ b/README.version
@@ -12,3 +12,4 @@
Support mocking of package private classes using dexmaker.share_classloader
Scan for methods in extra interface hierarchy
Update stack trace cleaner to use new dex package name
+ Update stack trace cleaner to filter out java.lang.reflect.Proxy calls
diff --git a/dexmaker-mockito/src/main/java/com/android/dx/mockito/DexmakerMockMaker.java b/dexmaker-mockito/src/main/java/com/android/dx/mockito/DexmakerMockMaker.java
index 6204a75..4015059 100644
--- a/dexmaker-mockito/src/main/java/com/android/dx/mockito/DexmakerMockMaker.java
+++ b/dexmaker-mockito/src/main/java/com/android/dx/mockito/DexmakerMockMaker.java
@@ -112,6 +112,7 @@
return defaultCleaner.isIn(candidate)
&& !candidate.getClassName().endsWith("_Proxy") // dexmaker class proxies
&& !candidate.getClassName().startsWith("$Proxy") // dalvik interface proxies
+ && !candidate.getClassName().startsWith("java.lang.reflect.Proxy")
&& !candidate.getClassName().startsWith("com.google.dexmaker.mockito.")
&& !candidate.getClassName().startsWith("com.android.dx.mockito.");
}