Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 868495a0 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android Git Automerger
Browse files

am e23639e0: am 15afd076: Merge "MTP: Have GetStorageInfo command return... 

am e23639e0: am 15afd076: Merge "MTP: Have GetStorageInfo command return correct storage type for removable storage" into honeycomb-mr2

* commit 'e23639e0386735df50ad208078f638c38f662d42':
  MTP: Have GetStorageInfo command return correct storage type for removable storage
parents 5149f107 9e9bcb2c

media/mtp/MtpStorage.cpp

+4 −3
Original line number Diff line number Diff line
@@ -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 @@ MtpStorage::~MtpStorage() { 
}



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

+4 −1
Original line number Diff line number Diff line
@@ -33,10 +33,12 @@ private: 
    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 @@ public: 
    uint64_t                getFreeSpace();

    const char*             getDescription() const;

    inline const char*      getPath() const { return (const char *)mFilePath; }

    inline bool             isRemovable() const { return mRemovable; }

};



}; // namespace android