commit 7efab4282a7179b2f53a3dbccee3e70d7fce6a7f
author Mike Lockwood <lockwood@android.com> Mon May 09 20:16:05 2011 -0700
committer Mike Lockwood <lockwood@android.com> Mon May 16 14:29:45 2011 -0400
tree b8810c84c6b1c35f6c6e1dc826a02add2927fe80
parent 1a65546a55d019335655464ad895361ba9f89252

MTP: Have GetStorageInfo command return correct storage type for removable storage

Change-Id: I09b548483c12080e7d77970babcae2eef379f2f4
Signed-off-by: Mike Lockwood <lockwood@android.com>

media/mtp/MtpStorage.cpp

diff --git a/media/mtp/MtpStorage.cpp b/media/mtp/MtpStorage.cpp
index fff0b5f..fef8066 100644
--- a/media/mtp/MtpStorage.cpp
+++ b/media/mtp/MtpStorage.cpp
@@ -33,12 +33,13 @@
 namespace android {
 
 MtpStorage::MtpStorage(MtpStorageID id, const char* filePath,
-        const char* description, uint64_t reserveSpace)
+        const char* description, uint64_t reserveSpace, bool removable)
     :   mStorageID(id),
         mFilePath(filePath),
         mDescription(description),
         mMaxCapacity(0),
-        mReserveSpace(reserveSpace)
+        mReserveSpace(reserveSpace),
+        mRemovable(removable)
 {
     LOGV("MtpStorage id: %d path: %s\n", id, filePath);
 }
@@ -47,7 +48,7 @@
 }
 
 int MtpStorage::getType() const {
-    return MTP_STORAGE_FIXED_RAM;
+    return (mRemovable ? MTP_STORAGE_REMOVABLE_RAM :  MTP_STORAGE_FIXED_RAM);
 }
 
 int MtpStorage::getFileSystemType() const {

media/mtp/MtpStorage.h

diff --git a/media/mtp/MtpStorage.h b/media/mtp/MtpStorage.h
index d6ad25f..3e4f40d 100644
--- a/media/mtp/MtpStorage.h
+++ b/media/mtp/MtpStorage.h
@@ -33,10 +33,12 @@
     uint64_t                mMaxCapacity;
     // amount of free space to leave unallocated
     uint64_t                mReserveSpace;
+    bool                    mRemovable;
 
 public:
                             MtpStorage(MtpStorageID id, const char* filePath,
-                                    const char* description, uint64_t reserveSpace);
+                                    const char* description, uint64_t reserveSpace,
+                                    bool removable);
     virtual                 ~MtpStorage();
 
     inline MtpStorageID     getStorageID() const { return mStorageID; }
@@ -47,6 +49,7 @@
     uint64_t                getFreeSpace();
     const char*             getDescription() const;
     inline const char*      getPath() const { return (const char *)mFilePath; }
+    inline bool             isRemovable() const { return mRemovable; }
 };
 
 }; // namespace android