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

am: 0a02259bba Change-Id: I10256e0e19e07f0636561a202cd5a5f38a59047f
2017-04-21 20:26:59 +00:00
parent 90d020d979 0a02259bba
commit 8203c3694a
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