Merge "Move PackageManager to new auto-doc feature!" into oc-dev

2017-04-21 20:20:03 +00:00
parent 4b32f7c676 4347f8147b
commit 0a02259bba
2 changed files with 163 additions and 809 deletions
--- a/core/java/android/content/pm/ApplicationInfo.java
+++ b/core/java/android/content/pm/ApplicationInfo.java
@@ -891,7 +891,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
    public @Category int category = CATEGORY_UNDEFINED;

    /** {@hide} */
-    @IntDef({
+    @IntDef(prefix = { "CATEGORY_" }, value = {
            CATEGORY_UNDEFINED,
            CATEGORY_GAME,
            CATEGORY_AUDIO,
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java