Merge "Fix bugprone-use-after-move warnings" am: 1c7e676905 am: e59bd9e1a7 am: ec4685de6c am: 8d967847d3

Change-Id: I0d16e6a1f0585d1c28df6f34f1d5ca97fcf3fc20
This commit is contained in:
Automerger Merge Worker 2020-03-10 21:07:36 +00:00
commit 19251d1b2b
2 changed files with 4 additions and 2 deletions

View file

@ -790,8 +790,9 @@ void CameraDeviceSession::ResultBatcher::processCaptureResult(CaptureResult& res
auto it = batch->mBatchBufs.find(buffer.streamId);
if (it != batch->mBatchBufs.end()) {
InflightBatch::BufferBatch& bb = it->second;
auto id = buffer.streamId;
pushStreamBuffer(std::move(buffer), bb.mBuffers);
filledStreams.push_back(buffer.streamId);
filledStreams.push_back(id);
} else {
pushStreamBuffer(std::move(buffer), nonBatchedBuffers);
}

View file

@ -656,8 +656,9 @@ void CameraDeviceSession::ResultBatcher_3_4::processCaptureResult_3_4(CaptureRes
auto it = batch->mBatchBufs.find(buffer.streamId);
if (it != batch->mBatchBufs.end()) {
InflightBatch::BufferBatch& bb = it->second;
auto id = buffer.streamId;
pushStreamBuffer(std::move(buffer), bb.mBuffers);
filledStreams.push_back(buffer.streamId);
filledStreams.push_back(id);
} else {
pushStreamBuffer(std::move(buffer), nonBatchedBuffers);
}