diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-11-19 08:36:47 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-11-19 08:36:47 +0000 |
| commit | 03547b99765ad815723d11149a1b3bbb57eeb46b (patch) | |
| tree | 2c2e93f2498797eceab97e4798cf6c185c10aa9b | |
| parent | 8ea796a2e5c48341702b3cdf8588b0e769837c5e (diff) | |
| parent | aaaa1fae13a98db2b751ba7717ae5ca46d1e2688 (diff) | |
| download | dalvik-03547b99765ad815723d11149a1b3bbb57eeb46b.tar.gz | |
Snap for 4459973 from aaaa1fae13a98db2b751ba7717ae5ca46d1e2688 to pi-release
Change-Id: If41c01d0e914b3051572d63648d882e9e4905aa9
| -rw-r--r-- | dx/src/com/android/dx/cf/code/ConcreteMethod.java | 3 | ||||
| -rw-r--r-- | dx/tests/143-interface-methods/StaticDefinition.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/dx/src/com/android/dx/cf/code/ConcreteMethod.java b/dx/src/com/android/dx/cf/code/ConcreteMethod.java index 2210c89af..b544add77 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 @@ public final class ConcreteMethod implements Method { * @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 1a81738a0..ab82cfc2f 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); } } |