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

Commit d2ff9e16 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use String8/16 c_str [mtp]" into main am: e437e04a am: 9ddc0c48 am:... 

Merge "Use String8/16 c_str [mtp]" into main am: e437e04a am: 9ddc0c48 am: 54c4e27a am: 750d3d07

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2717294



Change-Id: I8c74d9e4a7c61b7cc30d4320bb4155bd697d2279
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4176015a 750d3d07

media/mtp/tests/MtpFuzzer/mtp_data_packet_fuzzer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ void MtpDataPacketFuzzer::process() { 
                    if (mFdp.ConsumeBool()) {

                        std::string str = mFdp.ConsumeRandomLengthString(kMaxLength);

                        android::String16 s(str.c_str());

                        char16_t* data = const_cast<char16_t*>(s.string());

                        char16_t* data = const_cast<char16_t*>(s.c_str());

                        mtpDataPacket.putString(reinterpret_cast<uint16_t*>(data));

                    } else {

                        mtpDataPacket.putString(static_cast<uint16_t*>(nullptr));

media/mtp/tests/MtpFuzzer/mtp_property_fuzzer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ void MtpPropertyFuzzer::process() { 
                    std::string str = mFdp.ConsumeRandomLengthString(kMaxLength);

                    android::String16 s(str.c_str());

                    if (mFdp.ConsumeBool()) {

                        data = const_cast<char16_t*>(s.string());

                        data = const_cast<char16_t*>(s.c_str());

                    }



                    if (mFdp.ConsumeBool()) {