Merge "Fix DefaultStackTraceCleaner to use the updated package name"android-o-preview-3

2 files changed, 3 insertions, 1 deletions

diff --git a/README.version b/README.version
index 6f448fc..7f7d2c2 100644
--- a/README.version
+++ b/README.version
@@ -11,3 +11,4 @@ It includes a stock code generator for class proxies. If you just want to do AOP
 Local Modifications:
         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
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 fb701c9..6204a75 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,7 +112,8 @@ public final class DexmakerMockMaker implements MockMaker, StackTraceCleanerProv
                 return defaultCleaner.isIn(candidate)
                         && !candidate.getClassName().endsWith("_Proxy") // dexmaker class proxies
                         && !candidate.getClassName().startsWith("$Proxy") // dalvik interface proxies
-                        && !candidate.getClassName().startsWith("com.google.dexmaker.mockito.");
+                        && !candidate.getClassName().startsWith("com.google.dexmaker.mockito.")
+                        && !candidate.getClassName().startsWith("com.android.dx.mockito.");
             }
         };
     }