| commit | ec30c30bcb87c1686856418ee52a2a512ceb624e | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Aug 25 01:20:49 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 25 01:20:49 2021 +0000 |
| tree | ae4998f36b1ccd263a1384b9938d8a31fc81c68d | |
| parent | b5a075077f6764212c8d227370ecbd44eb9e644c [diff] | |
| parent | 5b4752b837afa84c55c4f054e4894200b86f66f7 [diff] |
Merge "Fix CameraHidlTest" am: eb86f93f53 am: efba724466 am: 22557982dd am: 5b4752b837 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1771029 Change-Id: Idc9872f8016f2559bf840f686c1ad5b6e88e6402
diff --git a/camera/provider/2.4/default/LegacyCameraProviderImpl_2_4.cpp b/camera/provider/2.4/default/LegacyCameraProviderImpl_2_4.cpp index 4cff1b7..7c3b982 100644 --- a/camera/provider/2.4/default/LegacyCameraProviderImpl_2_4.cpp +++ b/camera/provider/2.4/default/LegacyCameraProviderImpl_2_4.cpp
@@ -450,7 +450,9 @@ 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);