summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2011-04-11 14:28:34 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-04-11 14:28:34 -0700
commitd08b2ad9bcee6d2c3169d62bd69033e7da3d3829 (patch)
treeec780cbcd9a389c0191e8f5fbf73c2a9bbb0d863 /libs
parent3ef8b7463c499a1294a6235ad5c86db8e249d35c (diff)
parent9e13c7e5d787252b2a88aace1115b51a95e16b5d (diff)
downloadframeworks_base-d08b2ad9bcee6d2c3169d62bd69033e7da3d3829.zip
frameworks_base-d08b2ad9bcee6d2c3169d62bd69033e7da3d3829.tar.gz
frameworks_base-d08b2ad9bcee6d2c3169d62bd69033e7da3d3829.tar.bz2
am 9e13c7e5: am 9645081c: am 43707a83: UsbManager: minor Javadoc tweak
* commit '9e13c7e5d787252b2a88aace1115b51a95e16b5d': UsbManager: minor Javadoc tweak
Diffstat (limited to 'libs')
-rw-r--r--libs/usb/src/com/android/future/usb/UsbManager.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/usb/src/com/android/future/usb/UsbManager.java b/libs/usb/src/com/android/future/usb/UsbManager.java
index d424b63..91d8e8a 100644
--- a/libs/usb/src/com/android/future/usb/UsbManager.java
+++ b/libs/usb/src/com/android/future/usb/UsbManager.java
@@ -28,7 +28,7 @@ import android.os.ServiceManager;
import android.util.Log;
/**
- * This class allows you to access the state of USB, both in host and device mode.
+ * This is a wrapper class for the USB Manager to support USB accessories.
*
* <p>You can obtain an instance of this class by calling {@link #getInstance}
*
@@ -141,7 +141,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} or
* by the user choosing the caller as the default application for the accessory.
*
* @param accessory to check permissions for