commit c899d99107cebd6c15e7ecf3fa54e25ade99fe6b
author Etan Cohen <etancohen@google.com> Mon May 22 13:39:52 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon May 22 13:39:52 2017 +0000
tree 546517b3740b0531713652af46b0cc99eec46a71
parent 13d3edc40c3e754a35d7975acda659cd03070167
parent 3339e6bdc5788bdac03bf075b51aa142e1da0c2c

Merge "Fix DefaultStackTraceCleaner to use the updated package name" am: a22ad79d7a am: 21b0422bd2 am: 1ad52091a4
am: 3339e6bdc5

Change-Id: I91d1a6d037bee81c8839944e313ad80699aa3d62

README.version

diff --git a/README.version b/README.version
index 6f448fc..7f7d2c2 100644
--- a/README.version
+++ b/README.version
@@ -11,3 +11,4 @@
 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

dexmaker-mockito/src/main/java/com/android/dx/mockito/DexmakerMockMaker.java

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 @@
                 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.");
             }
         };
     }