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

Commit 88ca4b12 authored by Atneya Nair's avatar Atneya Nair
Browse files

Fix ambiguous String8 conversion 

The MtpString type has implicit conversions to const char* as well as
std::string_view.

Explicitly convert to std::string_view when passing to String8 to
resolve overload ambiguity in the direction of the preferable call.

Test: compiles
Flag: EXEMPT infeasible
Bug:
Change-Id: Iea50eef3fcba628173fcec784401e8c0b867b90d
parent 821abb8a

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)) {