Merge "Fixed javadoc so @hide annotations don't show up in the API." (0f9f6713) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −6

Original line number	Diff line number	Diff line
		@@ -3676,9 +3676,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();
		@@ -5783,9 +5780,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);

+0 −6

Original line number	Diff line number	Diff line
		@@ -3798,9 +3798,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();
		@@ -5918,9 +5915,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);

+0 −6

Original line number	Diff line number	Diff line
		@@ -3676,9 +3676,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();
		@@ -5785,9 +5782,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);

+4 −4

Original line number	Diff line number	Diff line
		@@ -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

+5 −5

Original line number	Diff line number	Diff line
		@@ -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;