commit dcc08f073b6873c69ab891d4f69f7c568e282df7
author The Android Open Source Project <initial-contribution@android.com> Wed Dec 17 18:03:49 2008 -0800
committer The Android Open Source Project <initial-contribution@android.com> Wed Dec 17 18:03:49 2008 -0800
tree cbaa218be3f46078555b6bfb36c48659096a747a
parent d3aa4000e42fd1036e0e3286843c5132f905d754

Code drop from //branches/cupcake/...@124589

tools/droiddoc/src/MethodInfo.java

diff --git a/tools/droiddoc/src/MethodInfo.java b/tools/droiddoc/src/MethodInfo.java
index ed98378..ca30665 100644
--- a/tools/droiddoc/src/MethodInfo.java
+++ b/tools/droiddoc/src/MethodInfo.java
@@ -266,9 +266,12 @@
                         ClassInfo[] thrownExceptions, SourcePositionInfo position,
                         AnnotationInstanceInfo[] annotations)
     {
+        // Explicitly coerce 'final' state of Java6-compiled enum values() method, to match
+        // the Java5-emitted base API description.
         super(rawCommentText, name, signature, containingClass, realContainingClass,
                 isPublic, isProtected, isPackagePrivate, isPrivate,
-                isFinal, isStatic, isSynthetic, kind, position, annotations);
+                ((name.equals("values") && containingClass.isEnum()) ? true : isFinal),
+                isStatic, isSynthetic, kind, position, annotations);
 
         // The underlying MethodDoc for an interface's declared methods winds up being marked
         // non-abstract.  Correct that here by looking at the immediate-parent class, and marking