Merge "Do not consider clinit as static interface method"
diff --git a/dx/src/com/android/dx/cf/code/ConcreteMethod.java b/dx/src/com/android/dx/cf/code/ConcreteMethod.java
index 2210c89..b544add 100644
--- a/dx/src/com/android/dx/cf/code/ConcreteMethod.java
+++ b/dx/src/com/android/dx/cf/code/ConcreteMethod.java
@@ -138,7 +138,8 @@
* @return true if the method is being defined on an interface.
*/
public final boolean isDefaultOrStaticInterfaceMethod() {
- return (classFile.getAccessFlags() & AccessFlags.ACC_INTERFACE) != 0;
+ return (classFile.getAccessFlags() & AccessFlags.ACC_INTERFACE) != 0
+ && !getNat().isClassInit();
}
/**
diff --git a/dx/tests/143-interface-methods/StaticDefinition.java b/dx/tests/143-interface-methods/StaticDefinition.java
index 1a81738..ab82cfc 100644
--- a/dx/tests/143-interface-methods/StaticDefinition.java
+++ b/dx/tests/143-interface-methods/StaticDefinition.java
@@ -15,7 +15,8 @@
*/
public interface StaticDefinition {
- public static void printIt(String s) {
+ long createsClinit = System.currentTimeMillis();
+ public static void printIt(String s) {
System.out.println(s);
}
}