Merge "Fix some issues found by new doclava linter." into oc-dev (a00c7c0a) · Commits · e / os / android_frameworks_base

Android.mk

+3 −2

Original line number	Diff line number	Diff line
		@@ -922,6 +922,7 @@ framework_docs_LOCAL_DROIDDOC_HTML_DIR := docs/html
		# Conscrypt (com.android.org.conscrypt) is an implementation detail and should
		# not be referenced in the documentation.
		framework_docs_LOCAL_DROIDDOC_OPTIONS := \
		-android \
		-knowntags ./frameworks/base/docs/knowntags.txt \
		-knowntags ./libcore/known_oj_tags.txt \
		-hidePackage com.android.org.conscrypt \
		@@ -951,8 +952,8 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \
		-since $(SRC_API_DIR)/24.txt 24 \
		-since $(SRC_API_DIR)/25.txt 25 \
		-since ./frameworks/base/api/current.txt O \
		-werror -hide 111 -hide 113 \
		-overview $(LOCAL_PATH)/core/java/overview.html
		-werror -hide 111 -hide 113 -hide 121 \
		-overview $(LOCAL_PATH)/core/java/overview.html \

		# Allow the support library to add its own droiddoc options.
		include $(LOCAL_PATH)/../support/droiddoc.mk

core/java/android/app/WallpaperManager.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -20,7 +20,9 @@ import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.RawRes;
		import android.annotation.SdkConstant;
		import android.annotation.SystemApi;
		import android.annotation.SdkConstant.SdkConstantType;
		import android.content.ComponentName;
		import android.content.ContentResolver;
		import android.content.Context;
		@@ -103,6 +105,7 @@ public class WallpaperManager {
		* <p>Output: RESULT_OK if user decided to crop/set the wallpaper, RESULT_CANCEL otherwise
		* Activities that support this intent should specify a MIME filter of "image/*"
		*/
		@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
		public static final String ACTION_CROP_AND_SET_WALLPAPER =
		"android.service.wallpaper.CROP_AND_SET_WALLPAPER";

core/java/android/content/Intent.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -1399,6 +1399,7 @@ public class Intent implements Parcelable, Cloneable {
		* <p>Input: nothing
		* <p>Output: nothing
		*/
		@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
		public static final String ACTION_FACTORY_TEST = "android.intent.action.FACTORY_TEST";

		/**
		@@ -2061,6 +2062,7 @@ public class Intent implements Parcelable, Cloneable {
		* temporary system dialog to dismiss. Some examples of temporary system
		* dialogs are the notification window-shade and the recent tasks dialog.
		*/
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String ACTION_CLOSE_SYSTEM_DIALOGS = "android.intent.action.CLOSE_SYSTEM_DIALOGS";
		/**
		* Broadcast Action: Trigger the download and eventual installation
		@@ -2590,6 +2592,7 @@ public class Intent implements Parcelable, Cloneable {
		* @deprecated replaced by android.os.storage.StorageEventListener
		*/
		@Deprecated
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String ACTION_UMS_CONNECTED = "android.intent.action.UMS_CONNECTED";

		/**
		@@ -2600,6 +2603,7 @@ public class Intent implements Parcelable, Cloneable {
		* @deprecated replaced by android.os.storage.StorageEventListener
		*/
		@Deprecated
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String ACTION_UMS_DISCONNECTED = "android.intent.action.UMS_DISCONNECTED";

		/**

core/java/android/hardware/usb/UsbManager.java

+8 −2

Original line number	Diff line number	Diff line
		@@ -17,9 +17,9 @@

		package android.hardware.usb;

		import com.android.internal.util.Preconditions;

		import android.annotation.Nullable;
		import android.annotation.SdkConstant;
		import android.annotation.SdkConstant.SdkConstantType;
		import android.app.PendingIntent;
		import android.content.ComponentName;
		import android.content.Context;
		@@ -30,6 +30,8 @@ import android.os.Process;
		import android.os.RemoteException;
		import android.util.Log;

		import com.android.internal.util.Preconditions;

		import java.util.HashMap;

		/**
		@@ -109,6 +111,7 @@ public class UsbManager {
		* for the attached device
		* </ul>
		*/
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String ACTION_USB_DEVICE_ATTACHED =
		"android.hardware.usb.action.USB_DEVICE_ATTACHED";

		@@ -121,6 +124,7 @@ public class UsbManager {
		* for the detached device
		* </ul>
		*/
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String ACTION_USB_DEVICE_DETACHED =
		"android.hardware.usb.action.USB_DEVICE_DETACHED";

		@@ -133,6 +137,7 @@ public class UsbManager {
		* for the attached accessory
		* </ul>
		*/
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String ACTION_USB_ACCESSORY_ATTACHED =
		"android.hardware.usb.action.USB_ACCESSORY_ATTACHED";

		@@ -145,6 +150,7 @@ public class UsbManager {
		* for the attached accessory that was detached
		* </ul>
		*/
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String ACTION_USB_ACCESSORY_DETACHED =
		"android.hardware.usb.action.USB_ACCESSORY_DETACHED";

core/java/android/os/DropBoxManager.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package android.os;

		import android.annotation.SdkConstant;
		import android.annotation.SdkConstant.SdkConstantType;
		import android.content.Context;
		import android.util.Log;

		@@ -67,6 +69,7 @@ public class DropBoxManager {
		* <p class="note">This is a protected intent that can only be sent
		* by the system.
		*/
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String ACTION_DROPBOX_ENTRY_ADDED =
		"android.intent.action.DROPBOX_ENTRY_ADDED";