Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "midi: Use std::optional instead of std::unique_ptr" am: e20137fccd am: 85056fca49

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

Change-Id: I8e5e4f4f0f7d1b967fab2613f5b8a7e23fede084
This commit is contained in:
Jooyung Han
2020-11-25 06:12:24 +00:00
committed by Automerger Merge Worker
parent e0f68a4855 85056fca49
commit 54ea8228cc
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media/native/midi/MidiDeviceInfo.cpp
View File

@@ -90,13 +90,13 @@ status_t MidiDeviceInfo::readFromParcel(const Parcel* parcel) {
status_t MidiDeviceInfo::readStringVector( status_t MidiDeviceInfo::readStringVector(
const Parcel* parcel, Vector<String16> *vectorPtr, size_t defaultLength) { 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); status_t result = parcel->readString16Vector(&v);
if (result != OK) return result; if (result != OK) return result;
vectorPtr->clear(); vectorPtr->clear();
if (v.get() != nullptr) { if (v) {
for (const auto& iter : *v) { for (const auto& iter : *v) {
if (iter.get() != nullptr) { if (iter) {
vectorPtr->push_back(*iter); vectorPtr->push_back(*iter);
} else { } else {
vectorPtr->push_back(String16()); vectorPtr->push_back(String16());