commit | 18c7e5880b145b1766356f06c6dec42694031483 | [log] [tgz] |
---|---|---|
author | Ivan Gavrilovic <gavra@google.com> | Fri Nov 17 07:31:17 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Nov 17 07:31:17 2017 +0000 |
tree | 2c2e93f2498797eceab97e4798cf6c185c10aa9b | |
parent | 1cc5f8aeb3fa7d0fe7a986f4fb69189940367aab [diff] | |
parent | 7af1e1070f5af831d340854a6c76127ea09ffadd [diff] |
Merge "Do not consider clinit as static interface method" am: 7af1e1070f Change-Id: I9ca7a4cef1d4e3acc46087b34cb8c1451464d72e
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); } }