summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2011-05-06 08:41:57 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-06 08:41:57 -0700
commit0d560d454b88d52a3b48cbc3c3be27e563b7f098 (patch)
tree438e87db7f784ea3fdc0ac9add8176a734c68a6f
parent8ce58e5062288c95887bd56fc959527814052b56 (diff)
parent9f7054fea28e65ae1bf8bc1114090306979ba657 (diff)
downloadframeworks_base-0d560d454b88d52a3b48cbc3c3be27e563b7f098.zip
frameworks_base-0d560d454b88d52a3b48cbc3c3be27e563b7f098.tar.gz
frameworks_base-0d560d454b88d52a3b48cbc3c3be27e563b7f098.tar.bz2
am 9f7054fe: Merge "docs: add package description for mtp and a little more info to MtpDevice" into honeycomb-mr1
* commit '9f7054fea28e65ae1bf8bc1114090306979ba657': docs: add package description for mtp and a little more info to MtpDevice
-rw-r--r--media/java/android/mtp/MtpDevice.java5
-rw-r--r--media/java/android/mtp/package.html8
2 files changed, 12 insertions, 1 deletions
diff --git a/media/java/android/mtp/MtpDevice.java b/media/java/android/mtp/MtpDevice.java
index 47bb8c9..3272fed 100644
--- a/media/java/android/mtp/MtpDevice.java
+++ b/media/java/android/mtp/MtpDevice.java
@@ -22,7 +22,10 @@ import android.os.ParcelFileDescriptor;
import android.util.Log;
/**
- * This class represents an MTP or PTP device connected on the USB host bus.
+ * This class represents an MTP or PTP device connected on the USB host bus. An application can
+ * instantiate an object of this type, by referencing an attached {@link
+ * android.hardware.usb.UsbDevice} and then use methods in this class to get information about the
+ * device and objects stored on it, as well as open the connection and transfer data.
*/
public final class MtpDevice {
diff --git a/media/java/android/mtp/package.html b/media/java/android/mtp/package.html
new file mode 100644
index 0000000..6bd9229
--- /dev/null
+++ b/media/java/android/mtp/package.html
@@ -0,0 +1,8 @@
+<html>
+<body>
+<p>Provides APIs that let you interact directly with connected cameras and other devices, using the
+PTP (Picture Transfer Protocol) subset of the MTP (Media Transfer Protocol) specification. Your
+application can receive notifications when devices are attached and removed, manage files and
+storage on those devices, and transfer files and metadata from the devices.</p>
+</body>
+</html> \ No newline at end of file