summaryrefslogtreecommitdiffstats
path: root/media/mtp/MtpTypes.h
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2010-05-25 19:08:48 -0400
committerMike Lockwood <lockwood@android.com>2010-06-01 22:12:44 -0400
commit5ed68d29a140e14c8d46980fa844548eb33b1e87 (patch)
tree76b370bbfac9fe8e2105c57bf21154f6dd245d38 /media/mtp/MtpTypes.h
parent77995c32095cc192823de3eedf0d5a404fbca72e (diff)
downloadframeworks_av-5ed68d29a140e14c8d46980fa844548eb33b1e87.zip
frameworks_av-5ed68d29a140e14c8d46980fa844548eb33b1e87.tar.gz
frameworks_av-5ed68d29a140e14c8d46980fa844548eb33b1e87.tar.bz2
Prototype Content Provider support for MTP/PTP devices.
At this point much of the plumbing is in place, but only a few simple queries are supported. This is enough to support a proof of concept sample program that navigates the file hierarchy of a digital camera connected via USB. Also removed obsolete ptptest host test program. Change-Id: I17644344b9f0ce1ecc302bc0478c1f3d44a1647f Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'media/mtp/MtpTypes.h')
-rw-r--r--media/mtp/MtpTypes.h22
1 files changed, 12 insertions, 10 deletions
diff --git a/media/mtp/MtpTypes.h b/media/mtp/MtpTypes.h
index 3ec844f..e3389c0 100644
--- a/media/mtp/MtpTypes.h
+++ b/media/mtp/MtpTypes.h
@@ -52,17 +52,19 @@ typedef uint32_t MtpObjectHandle;
#define kObjectHandleIndexMask 0x0FFFFFFF // mask for object index in file table
class MtpStorage;
+class MtpDevice;
-typedef android::Vector<MtpStorage *> MtpStorageList;
+typedef Vector<MtpStorage *> MtpStorageList;
+typedef Vector<MtpDevice*> MtpDeviceList;
-typedef android::Vector<uint8_t> UInt8List;
-typedef android::Vector<uint32_t> UInt16List;
-typedef android::Vector<uint32_t> UInt32List;
-typedef android::Vector<uint64_t> UInt64List;
-typedef android::Vector<int8_t> Int8List;
-typedef android::Vector<int32_t> Int16List;
-typedef android::Vector<int32_t> Int32List;
-typedef android::Vector<int64_t> Int64List;
+typedef Vector<uint8_t> UInt8List;
+typedef Vector<uint32_t> UInt16List;
+typedef Vector<uint32_t> UInt32List;
+typedef Vector<uint64_t> UInt64List;
+typedef Vector<int8_t> Int8List;
+typedef Vector<int32_t> Int16List;
+typedef Vector<int32_t> Int32List;
+typedef Vector<int64_t> Int64List;
typedef UInt16List MtpDevicePropertyList;
typedef UInt16List MtpObjectFormatList;
@@ -70,7 +72,7 @@ typedef UInt32List MtpObjectHandleList;
typedef UInt16List MtpObjectPropertyList;
typedef UInt32List MtpStorageIDList;
-typedef android::String8 MtpString;
+typedef String8 MtpString;
}; // namespace android