From dc7af96141bfce7db3e19bc7cd9e5667474631e1 Mon Sep 17 00:00:00 2001 From: Felipe Leme Date: Fri, 22 Jan 2016 18:27:03 -0800 Subject: [PATCH] Fixed javadoc so @hide annotations don't show up in the API. BUG: 26082535 Change-Id: Ifb5ddedddc87bc65dc5158286503c64581b5a4f3 --- api/current.txt | 6 ------ api/system-current.txt | 6 ------ api/test-current.txt | 6 ------ core/java/android/app/ActivityManager.java | 8 ++++---- core/java/android/app/admin/DeviceAdminReceiver.java | 10 +++++----- 5 files changed, 9 insertions(+), 27 deletions(-) diff --git a/api/current.txt b/api/current.txt index 729f4da56b6e..2354789de36b 100644 --- a/api/current.txt +++ b/api/current.txt @@ -3670,9 +3670,6 @@ package android.app { method public void startActivity(android.content.Context, android.content.Intent, android.os.Bundle); } - public static abstract class ActivityManager.BugreportMode implements java.lang.annotation.Annotation { - } - public static class ActivityManager.MemoryInfo implements android.os.Parcelable { ctor public ActivityManager.MemoryInfo(); method public int describeContents(); @@ -5777,9 +5774,6 @@ package android.app.admin { field public static final java.lang.String EXTRA_LOCK_TASK_PACKAGE = "android.app.extra.LOCK_TASK_PACKAGE"; } - public static abstract class DeviceAdminReceiver.BugreportFailureCode implements java.lang.annotation.Annotation { - } - public class DevicePolicyManager { method public void addCrossProfileIntentFilter(android.content.ComponentName, android.content.IntentFilter, int); method public boolean addCrossProfileWidgetProvider(android.content.ComponentName, java.lang.String); diff --git a/api/system-current.txt b/api/system-current.txt index da83f6a012a6..38168e7459f2 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -3792,9 +3792,6 @@ package android.app { method public void startActivity(android.content.Context, android.content.Intent, android.os.Bundle); } - public static abstract class ActivityManager.BugreportMode implements java.lang.annotation.Annotation { - } - public static class ActivityManager.MemoryInfo implements android.os.Parcelable { ctor public ActivityManager.MemoryInfo(); method public int describeContents(); @@ -5912,9 +5909,6 @@ package android.app.admin { field public static final java.lang.String EXTRA_LOCK_TASK_PACKAGE = "android.app.extra.LOCK_TASK_PACKAGE"; } - public static abstract class DeviceAdminReceiver.BugreportFailureCode implements java.lang.annotation.Annotation { - } - public class DevicePolicyManager { method public void addCrossProfileIntentFilter(android.content.ComponentName, android.content.IntentFilter, int); method public boolean addCrossProfileWidgetProvider(android.content.ComponentName, java.lang.String); diff --git a/api/test-current.txt b/api/test-current.txt index 4193cadd2ab6..863143708366 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -3670,9 +3670,6 @@ package android.app { method public void startActivity(android.content.Context, android.content.Intent, android.os.Bundle); } - public static abstract class ActivityManager.BugreportMode implements java.lang.annotation.Annotation { - } - public static class ActivityManager.MemoryInfo implements android.os.Parcelable { ctor public ActivityManager.MemoryInfo(); method public int describeContents(); @@ -5779,9 +5776,6 @@ package android.app.admin { field public static final java.lang.String EXTRA_LOCK_TASK_PACKAGE = "android.app.extra.LOCK_TASK_PACKAGE"; } - public static abstract class DeviceAdminReceiver.BugreportFailureCode implements java.lang.annotation.Annotation { - } - public class DevicePolicyManager { method public void addCrossProfileIntentFilter(android.content.ComponentName, android.content.IntentFilter, int); method public boolean addCrossProfileWidgetProvider(android.content.ComponentName, java.lang.String); diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index 2dc4fb907938..6307477aa766 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -85,16 +85,16 @@ public class ActivityManager { private final Context mContext; private final Handler mHandler; + /** + * Defines acceptable types of bugreports. + * @hide + */ @Retention(RetentionPolicy.SOURCE) @IntDef({ BUGREPORT_OPTION_FULL, BUGREPORT_OPTION_INTERACTIVE, BUGREPORT_OPTION_REMOTE }) - /** - * Defines acceptable types of bugreports. - * @hide - */ public @interface BugreportMode {} /** * Takes a bugreport without user interference (and hence causing less diff --git a/core/java/android/app/admin/DeviceAdminReceiver.java b/core/java/android/app/admin/DeviceAdminReceiver.java index cfd5ca88f3a5..3c1ecc79c888 100644 --- a/core/java/android/app/admin/DeviceAdminReceiver.java +++ b/core/java/android/app/admin/DeviceAdminReceiver.java @@ -283,17 +283,17 @@ public class DeviceAdminReceiver extends BroadcastReceiver { public static final String EXTRA_BUGREPORT_FAILURE_REASON = "android.app.extra.BUGREPORT_FAILURE_REASON"; - @Retention(RetentionPolicy.SOURCE) - @IntDef({ - BUGREPORT_FAILURE_FAILED_COMPLETING, - BUGREPORT_FAILURE_FILE_NO_LONGER_AVAILABLE - }) /** * An interface representing reason of bugreport failure. * * @see #EXTRA_BUGREPORT_FAILURE_REASON * @hide */ + @Retention(RetentionPolicy.SOURCE) + @IntDef({ + BUGREPORT_FAILURE_FAILED_COMPLETING, + BUGREPORT_FAILURE_FILE_NO_LONGER_AVAILABLE + }) public @interface BugreportFailureCode {} /** Bugreport completion process failed. */ public static final int BUGREPORT_FAILURE_FAILED_COMPLETING = 0; -- 2.11.0