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

Commit f7785521 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android (Google) Code Review
Browse files

Merge "MTP: Don't request thumbnails for folder objects in MtpCursor"

parents bc55034e f78b26a5

media/mtp/MtpCursor.cpp

+18 −12
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ bool MtpCursor::fillObject(CursorWindow* window, MtpDevice* device, 
                    goto fail;

                 break;

            case OBJECT_THUMB:

                if (!putThumbnail(window, objectID, row, i))

                if (!putThumbnail(window, objectID, objectInfo->mFormat, row, i))

                    goto fail;

                break;

            default:
@@ -427,19 +427,25 @@ bool MtpCursor::putString(CursorWindow* window, const char* text, int row, int c 
    return true;

}



bool MtpCursor::putThumbnail(CursorWindow* window, int objectID, int row, int column) {

bool MtpCursor::putThumbnail(CursorWindow* window, int objectID, int format, int row, int column) {

    MtpDevice* device = mClient->getDevice(mDeviceID);

    int size;

    void* thumbnail = device->getThumbnail(objectID, size);

    void* thumbnail;

    int size, offset;

    if (format == MTP_FORMAT_ASSOCIATION) {

        thumbnail = NULL;

        size = offset = 0;

    } else {

        thumbnail = device->getThumbnail(objectID, size);



        LOGD("putThumbnail: %p, size: %d\n", thumbnail, size);

    int offset = window->alloc(size);

        offset = window->alloc(size);

        if (!offset) {

            window->freeLastRow();

            LOGE("Failed allocating %u bytes for thumbnail", size);

            return false;

        }

    if (size > 0)

    }

    if (thumbnail)

        window->copyIn(offset, (const uint8_t*)thumbnail, size);



    // This must be updated after the call to alloc(), since that

media/mtp/MtpCursor.h

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ private: 
    bool        prepareRow(CursorWindow* window);

    bool        putLong(CursorWindow* window, int value, int row, int column);

    bool        putString(CursorWindow* window, const char* text, int row, int column);

    bool        putThumbnail(CursorWindow* window, int objectID, int row, int column);

    bool        putThumbnail(CursorWindow* window, int objectID, int format, int row, int column);

};



}; // namespace android