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

Commit e14ca1a8 authored by Atneya Nair's avatar Atneya Nair Committed by Automerger Merge Worker
Browse files

Merge "Fix ambiguous String8 conversion" into main am: 863fea81 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3461407



Change-Id: Ib6c7d1efb48210884594a584303f4a157023bc6c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1aabc914 863fea81

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