diff options
author | 2025-01-22 21:47:31 -0800 | |
---|---|---|
committer | 2025-01-22 21:49:20 -0800 | |
commit | 88ca4b125ef6cebd0513b1ee9d94a227187785ee (patch) | |
tree | 35eefa9264f44ab65313c00df1f50cc6746de18d | |
parent | 821abb8afdec0f69ceb31fbf7f44cc01a0c46dfb (diff) |
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
-rw-r--r-- | media/jni/android_mtp_MtpDatabase.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/jni/android_mtp_MtpDatabase.cpp b/media/jni/android_mtp_MtpDatabase.cpp index a77bc9fe0570..a1ce495fe33d 100644 --- a/media/jni/android_mtp_MtpDatabase.cpp +++ b/media/jni/android_mtp_MtpDatabase.cpp @@ -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)) { |