| commit | 146d3107be56b11093cc865c1548c9a93df62aa8 | [log] [tgz] |
|---|---|---|
| author | Christoffer Adamsen <christofferqa@google.com> | Thu Aug 07 11:17:44 2025 +0200 |
| committer | Christoffer Adamsen <christofferqa@google.com> | Thu Aug 07 02:18:40 2025 -0700 |
| tree | d2812ef9f10346392ddfe43b62303ce472a2a6cb | |
| parent | 19a4f1bc0e83739d179cd20e883cdb4a425d497f [diff] |
Fix ArrayIndexOutOfBoundsException in EnqueuerMockitoAnalysis Bug: b/437005995 Change-Id: I04d1ce7df906514a0e738b31c47617806d9df421
diff --git a/src/main/java/com/android/tools/r8/shaking/EnqueuerMockitoAnalysis.java b/src/main/java/com/android/tools/r8/shaking/EnqueuerMockitoAnalysis.java index 792ad59..b42c6db 100644 --- a/src/main/java/com/android/tools/r8/shaking/EnqueuerMockitoAnalysis.java +++ b/src/main/java/com/android/tools/r8/shaking/EnqueuerMockitoAnalysis.java
@@ -67,9 +67,10 @@ } private boolean isReflectiveMockInvoke(DexMethod invokedMethod) { - return invokedMethod.holder.isIdenticalTo(mockitoType) + return invokedMethod.getHolderType().isIdenticalTo(mockitoType) && (invokedMethod.getName().isIdenticalTo(mockString) - || invokedMethod.getName().isIdenticalTo(spyString)); + || invokedMethod.getName().isIdenticalTo(spyString)) + && !invokedMethod.getParameters().isEmpty(); } @Override