diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-05-23 07:41:14 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-05-23 07:41:14 +0000 |
| commit | 47b07edee99ec4986a36149402663f34058d8494 (patch) | |
| tree | 546517b3740b0531713652af46b0cc99eec46a71 | |
| parent | 13d3edc40c3e754a35d7975acda659cd03070167 (diff) | |
| parent | c899d99107cebd6c15e7ecf3fa54e25ade99fe6b (diff) | |
| download | dexmaker-47b07edee99ec4986a36149402663f34058d8494.tar.gz | |
release-request-f2cd0207-2ed0-4e33-859f-0df0378165b1-for-git_oc-mr1-release-4033857 snap-temp-L00900000066751756
Change-Id: I01e5436a7191baf316c87a20b55688ba1deef24c
| -rw-r--r-- | README.version | 1 | ||||
| -rw-r--r-- | dexmaker-mockito/src/main/java/com/android/dx/mockito/DexmakerMockMaker.java | 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."); } }; } |