diff options
| -rw-r--r-- | media/native/midi/MidiDeviceInfo.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/native/midi/MidiDeviceInfo.cpp b/media/native/midi/MidiDeviceInfo.cpp index ac68d26c935b..8a573fba322b 100644 --- a/media/native/midi/MidiDeviceInfo.cpp +++ b/media/native/midi/MidiDeviceInfo.cpp @@ -90,13 +90,13 @@ status_t MidiDeviceInfo::readFromParcel(const Parcel* parcel) { status_t MidiDeviceInfo::readStringVector( const Parcel* parcel, Vector<String16> *vectorPtr, size_t defaultLength) { - std::unique_ptr<std::vector<std::unique_ptr<String16>>> v; + std::optional<std::vector<std::optional<String16>>> v; status_t result = parcel->readString16Vector(&v); if (result != OK) return result; vectorPtr->clear(); - if (v.get() != nullptr) { + if (v) { for (const auto& iter : *v) { - if (iter.get() != nullptr) { + if (iter) { vectorPtr->push_back(*iter); } else { vectorPtr->push_back(String16()); |