diff options
Diffstat (limited to 'dexmaker')
| -rw-r--r-- | dexmaker/src/main/java/com/android/dx/stock/ProxyBuilder.java | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/dexmaker/src/main/java/com/android/dx/stock/ProxyBuilder.java b/dexmaker/src/main/java/com/android/dx/stock/ProxyBuilder.java index 1daf8e3..b618c84 100644 --- a/dexmaker/src/main/java/com/android/dx/stock/ProxyBuilder.java +++ b/dexmaker/src/main/java/com/android/dx/stock/ProxyBuilder.java @@ -632,9 +632,13 @@ public final class ProxyBuilder<T> { private Method[] getMethodsToProxyRecursive() { Set<MethodSetEntry> methodsToProxy = new HashSet<>(); Set<MethodSetEntry> seenFinalMethods = new HashSet<>(); + // Traverse the class hierarchy to ensure that all concrete methods (which could be marked + // as final) are visited before any abstract methods from interfaces. for (Class<?> c = baseClass; c != null; c = c.getSuperclass()) { getMethodsToProxy(methodsToProxy, seenFinalMethods, c); } + // Now traverse the interface hierarchy, starting with the ones implemented by the class, + // followed by any extra interfaces. for (Class<?> c = baseClass; c != null; c = c.getSuperclass()) { for (Class<?> i : c.getInterfaces()) { getMethodsToProxy(methodsToProxy, seenFinalMethods, i); @@ -710,6 +714,14 @@ public final class ProxyBuilder<T> { } sink.add(entry); } + + // Only visit the interfaces of this class if it is itself an interface. That prevents + // visiting interfaces of a class before its super classes. + if (c.isInterface()) { + for (Class<?> i : c.getInterfaces()) { + getMethodsToProxy(sink, seenFinalMethods, i); + } + } } private static <T> String getMethodNameForProxyOf(Class<T> clazz) { |