Merge "Fix CameraHidlTest" am: eb86f93f53

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1771029

Change-Id: Ie6c744bdd5cd3ffa36647fa1fbe4a985a89916e3
This commit is contained in:
Treehugger Robot
2021-08-25 00:38:56 +00:00
committed by Automerger Merge Worker

View File

@@ -450,7 +450,9 @@ Return<Status> LegacyCameraProviderImpl_2_4::setCallback(
const sp<ICameraProviderCallback>& callback) {
Mutex::Autolock _l(mCbLock);
mCallbacks = callback;
if (mCallbacks == nullptr) {
return Status::OK;
}
// Add and report all presenting external cameras.
for (auto const& statusPair : mCameraStatusMap) {
int id = std::stoi(statusPair.first);