From 0241cacb85dbac20b28036bbb8025dfd513e3753 Mon Sep 17 00:00:00 2001 From: Mike Lockwood Date: Tue, 5 Apr 2011 10:21:27 -0400 Subject: DO NOT MERGE MTP and media provider support for multiple storage devices: - MTP support for multiple storage units - Add storage_id column to media database for MTP storage ID - Add framework resource for defining mount points and user visible descriptions for multiple volumes - Clean up locking in MtpServer JNI code Change-Id: Ide6d47bd9aa1698ed2a13d695613e03f2a9b29e3 Signed-off-by: Mike Lockwood --- media/mtp/MtpStorage.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'media/mtp/MtpStorage.cpp') diff --git a/media/mtp/MtpStorage.cpp b/media/mtp/MtpStorage.cpp index 6cb88b3..fff0b5f 100644 --- a/media/mtp/MtpStorage.cpp +++ b/media/mtp/MtpStorage.cpp @@ -32,9 +32,11 @@ namespace android { -MtpStorage::MtpStorage(MtpStorageID id, const char* filePath, uint64_t reserveSpace) +MtpStorage::MtpStorage(MtpStorageID id, const char* filePath, + const char* description, uint64_t reserveSpace) : mStorageID(id), mFilePath(filePath), + mDescription(description), mMaxCapacity(0), mReserveSpace(reserveSpace) { @@ -75,7 +77,7 @@ uint64_t MtpStorage::getFreeSpace() { } const char* MtpStorage::getDescription() const { - return "Device Storage"; + return (const char *)mDescription; } } // namespace android -- cgit v1.1