diff options
| author | Ian Rogers <irogers@google.com> | 2013-09-15 14:04:43 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2013-09-21 21:35:09 -0700 |
| commit | 98430d0d75f4cfd40614b77debeb3c8d0abf40df (patch) | |
| tree | 896560d4901eaffa22024f075eacee25da51278d /libart | |
| parent | d4ec55c4e1acc3c3df937facbd367aff6618536c (diff) | |
| download | libcore-98430d0d75f4cfd40614b77debeb3c8d0abf40df.zip libcore-98430d0d75f4cfd40614b77debeb3c8d0abf40df.tar.gz libcore-98430d0d75f4cfd40614b77debeb3c8d0abf40df.tar.bz2 | |
Fix getGenericInterfaces for the no annotation case.
Bug: 10244719
(cherry-picked from 43111aab512b1a7c7c8095a7135a7ae2754ea5bd)
Change-Id: I758d32e9cffcabf771e6f5f86ffa2666c8e1cb02
Conflicts:
libdvm/src/main/java/java/lang/Class.java
Diffstat (limited to 'libart')
| -rw-r--r-- | libart/src/main/java/java/lang/Class.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libart/src/main/java/java/lang/Class.java b/libart/src/main/java/java/lang/Class.java index f950982..6783796 100644 --- a/libart/src/main/java/java/lang/Class.java +++ b/libart/src/main/java/java/lang/Class.java @@ -1103,7 +1103,7 @@ public final class Class<T> implements Serializable, AnnotatedElement, GenericDe public Type[] getGenericInterfaces() { String annotationSignature = AnnotationAccess.getSignature(this); if (annotationSignature == null) { - return EmptyArray.TYPE; + return getInterfaces(); } GenericSignatureParser parser = new GenericSignatureParser(getClassLoader()); parser.parseForClass(this, annotationSignature); |