tree 8c11a85639fd5c7ffff5108df74c00b5f8eb69ec
parent 579ec757e287efb4ed0bb5a08e21663be0146bcb
author Wei Lee <wtlee@google.com> 1621025142 +0800
committer Commit Bot <commit-bot@chromium.org> 1621394590 +0000

camera: Fix deadlock when exiting cros camera service

In CameraHalServerImpl::ExitOnMainThread(), we acquire
|ipc_bridge_lock_|, delete ipc bridge and then reset
|camera_hal_adapter_|. However, when resetting |camera_hal_adapter_|, it
might try to call CameraHalServerImpl::OnCameraActivityChange() which
also try to acquire |ipc_bridge_lock_|. Therefore, a deadlock happens
and blocking the exiting of the process.

This CL fix it by wrapping codes into scope so that the lock can be
released right after usage.

BUG=b:187420388
TEST=tast run [DUT] camera.CaptureUnittests (on Jacuzzi) and pass 20
times continuously

Change-Id: I1fcf83c53b88fccbd9d5ac733c97abb06c5d1532
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/2898397
Commit-Queue: Wei Lee <wtlee@chromium.org>
Tested-by: Wei Lee <wtlee@chromium.org>
Auto-Submit: Wei Lee <wtlee@chromium.org>
Reviewed-by: Shik Chen <shik@chromium.org>
(cherry picked from commit a7edd086c83eec566e04e74b104cf7c4c121b076)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/2902537
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>