summaryrefslogtreecommitdiffstats
path: root/media/java/android/mtp
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2011-05-08 22:11:52 -0700
committerThe Android Automerger <android-build@android.com>2011-05-08 22:11:52 -0700
commit158e3582c03ab9e0221718da20fc8854bb9216d0 (patch)
tree805d133506cb9e4d4b7ad129d8060228ce156539 /media/java/android/mtp
parentc351f52a4a40155444e956824dd738d7a41678d9 (diff)
parent5cf78ecd2c523be442f52888ca613b9a92325a6c (diff)
downloadframeworks_base-158e3582c03ab9e0221718da20fc8854bb9216d0.zip
frameworks_base-158e3582c03ab9e0221718da20fc8854bb9216d0.tar.gz
frameworks_base-158e3582c03ab9e0221718da20fc8854bb9216d0.tar.bz2
Merge remote branch 'goog/honeycomb-mr1' into honeycomb-mr2
Diffstat (limited to 'media/java/android/mtp')
-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