diff options
| author | Ed Heyl <edheyl@google.com> | 2011-03-09 12:53:38 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-09 12:53:38 -0800 |
| commit | b22bb1dae1213fe9383020a53eeb89de40e7bbd0 (patch) | |
| tree | a54af58b70cac5c40c430d532fcdbcc92f02855a | |
| parent | cc34967fdcbf64826a068901d6fb1bd8bb1fa99f (diff) | |
| parent | 980f0430c16a8767061a6f7f3506aabf79735ef6 (diff) | |
| download | frameworks_base-b22bb1dae1213fe9383020a53eeb89de40e7bbd0.zip frameworks_base-b22bb1dae1213fe9383020a53eeb89de40e7bbd0.tar.gz frameworks_base-b22bb1dae1213fe9383020a53eeb89de40e7bbd0.tar.bz2 | |
Merge "UsbManager: Fix broken Javadoc links" into honeycomb-mr1
| -rw-r--r-- | core/java/android/hardware/usb/UsbManager.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/core/java/android/hardware/usb/UsbManager.java b/core/java/android/hardware/usb/UsbManager.java index 5df0ac7..e80c744 100644 --- a/core/java/android/hardware/usb/UsbManager.java +++ b/core/java/android/hardware/usb/UsbManager.java @@ -100,7 +100,7 @@ public class UsbManager { * * This intent is sent when a USB accessory is detached. * <ul> - * <li> {@link #EXTRA_ACCESSORY} containing the {@link android.hardware.usb.UsbAccessory} + * <li> {@link #EXTRA_ACCESSORY} containing the {@link UsbAccessory} * for the attached accessory that was detached * </ul> */ @@ -180,10 +180,8 @@ public class UsbManager { /** * Name of extra added to the {@link android.app.PendingIntent} - * passed into - * {#requestPermission(android.content.Context, android.hardware.usb.UsbDevice, android.app.PendingIntent)} - * or - * {#requestPermission(android.content.Context, android.hardware.usb.UsbAccessory, android.app.PendingIntent)} + * passed into {@link #requestPermission(UsbDevice, PendingIntent)} + * or {@link #requestPermission(UsbAccessory, PendingIntent)} * containing a boolean value indicating whether the user granted permission or not. */ public static final String EXTRA_PERMISSION_GRANTED = "permission"; @@ -282,7 +280,7 @@ public class UsbManager { /** * Returns true if the caller has permission to access the device. * Permission might have been granted temporarily via - * {@link #requestPermission(android.hardware.usb.UsbDevice} or + * {@link #requestPermission(UsbDevice, PendingIntent)} or * by the user choosing the caller as the default application for the device. * * @param device to check permissions for @@ -300,7 +298,7 @@ public class UsbManager { /** * Returns true if the caller has permission to access the accessory. * Permission might have been granted temporarily via - * {@link #requestPermission(android.hardware.usb.UsbAccessory} or + * {@link #requestPermission(UsbAccessory, PendingIntent)} or * by the user choosing the caller as the default application for the accessory. * * @param accessory to check permissions for |