Merge "When decoding enum annotation value, treat it as a field name, not enum value"

1 files changed, 14 insertions, 4 deletions

diff --git a/luni/src/main/java/libcore/reflect/AnnotationAccess.java b/luni/src/main/java/libcore/reflect/AnnotationAccess.java
index c2b54ce..6ff82c4 100644
--- a/luni/src/main/java/libcore/reflect/AnnotationAccess.java
+++ b/luni/src/main/java/libcore/reflect/AnnotationAccess.java
@@ -708,10 +708,20 @@ public final class AnnotationAccess {
         } else if (type.isEnum()) {
             int fieldIndex = reader.readEnum();
             FieldId fieldId = dex.fieldIds().get(fieldIndex);
-            String enumName = dex.strings().get(fieldId.getNameIndex());
-            @SuppressWarnings({"unchecked", "rawtypes"}) // Class.isEnum is the runtime check
-            Class<? extends Enum> enumType = (Class<? extends Enum>) type;
-            return Enum.valueOf(enumType, enumName);
+            String fieldName = dex.strings().get(fieldId.getNameIndex());
+            Field field;
+            try {
+                field = type.getDeclaredField(fieldName);
+                return field.get(null);
+            } catch (NoSuchFieldException e) {
+                NoSuchFieldError error = new NoSuchFieldError();
+                error.initCause(e);
+                throw error;
+            } catch (IllegalAccessException e) {
+                IllegalAccessError error = new IllegalAccessError();
+                error.initCause(e);
+                throw error;
+            }
         } else if (type.isAnnotation()) {
             @SuppressWarnings("unchecked") // Class.isAnnotation is the runtime check
             Class<? extends Annotation> annotationClass = (Class<? extends Annotation>) type;