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

Commit 863fea81 authored by Atneya Nair's avatar Atneya Nair Committed by Gerrit Code Review
Browse files

Merge "Fix ambiguous String8 conversion" into main

parents c5c8636a 88ca4b12

media/jni/android_mtp_MtpDatabase.cpp

+2 −2
Original line number Diff line number Diff line
@@ -910,7 +910,7 @@ MtpResponseCode MtpDatabase::getObjectInfo(MtpObjectHandle handle, 
        case MTP_FORMAT_TIFF:

        case MTP_FORMAT_TIFF_EP:

        case MTP_FORMAT_DEFINED: {

            String8 temp(path);

            String8 temp {static_cast<std::string_view>(path)};

            std::unique_ptr<FileStream> stream(new FileStream(temp));

            piex::PreviewImageData image_data;

            if (!GetExifFromRawImage(stream.get(), temp, image_data)) {
@@ -967,7 +967,7 @@ void* MtpDatabase::getThumbnail(MtpObjectHandle handle, size_t& outThumbSize) { 
            case MTP_FORMAT_TIFF:

            case MTP_FORMAT_TIFF_EP:

            case MTP_FORMAT_DEFINED: {

                String8 temp(path);

                String8 temp {static_cast<std::string_view>(path)};

                std::unique_ptr<FileStream> stream(new FileStream(temp));

                piex::PreviewImageData image_data;

                if (!GetExifFromRawImage(stream.get(), temp, image_data)) {