Fix Class.getEnclosingClass for anonymous classes declared in <clinit> methods

(cherry picked from commit b9be313bdc257089534f738ff8e1e5ad4de3d25e)

Bug: 11245138
Related bug: https://code.google.com/p/android/issues/detail?id=61003

Change-Id: I5cc1db6ca6628b845409d7a6ea864da5f625fdc3

1 files changed, 5 insertions, 4 deletions

diff --git a/libart/src/main/java/java/lang/Class.java b/libart/src/main/java/java/lang/Class.java
index d4f5cbd35..eda2b5c9e 100644
--- a/libart/src/main/java/java/lang/Class.java
+++ b/libart/src/main/java/java/lang/Class.java
@@ -958,7 +958,7 @@ public final class Class<T> implements Serializable, AnnotatedElement, GenericDe
         if (AnnotationAccess.isAnonymousClass(this)) {
             return null;
         }
-        return AnnotationAccess.getDeclaringClass(this);
+        return AnnotationAccess.getEnclosingClass(this);
     }
 
     /**
@@ -973,9 +973,10 @@ public final class Class<T> implements Serializable, AnnotatedElement, GenericDe
             return declaringClass;
         }
         AccessibleObject member = AnnotationAccess.getEnclosingMethodOrConstructor(this);
-        return member != null
-                ? ((Member) member).getDeclaringClass()
-                : null;
+        if (member != null)  {
+            return ((Member) member).getDeclaringClass();
+        }
+        return AnnotationAccess.getEnclosingClass(this);
     }
 
     /**