diff options
| author | Jooyung Han <jooyung@google.com> | 2020-11-25 06:33:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-25 06:33:37 +0000 |
| commit | 6a37d9d29af6d4f5cb1fede4862a208b7451e440 (patch) | |
| tree | 5ccfe5ec11b025d987dfd6a0936bacb83161efad | |
| parent | 0e0b760e62b3898bedb4a81aaa7041476bf1f93d (diff) | |
| parent | 54ea8228cc436b6cd5e3fcc47c1c9b19f48f8a0f (diff) | |
Merge "midi: Use std::optional instead of std::unique_ptr" am: e20137fccd am: 85056fca49 am: 54ea8228cc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1502510
Change-Id: I295a0179516cfc8368cebcc9ed748846c82d04f5
| -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()); |