Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 58aa9c1f authored by Emilian Peev's avatar Emilian Peev
Browse files

Camera: Avoid possible deadlock during R&C updates

Rotate and crop updates in the legacy shim layer are
synchronized via the 'mBinderSerializationLock'.
The binder thread that does this will also acquire
the camera service lock. However there might another
thread that is in the middle of a client disconnect
and already owns 'mBinderSerializationLock'. The second
thread will also try to acquire the camera service lock
as shown below and this can result in a deadlock.
Avoid this by using a dedicated lock for the rotate and
crop updates instead of 'mBinderSerializationLock'.

Thread 2:
android::CameraService::removeByClient
..
android::Camera2Client::disconnect()

Thread 1:
android::Camera2Client::setRotateAndCropOverride
android::CameraService::notifyDisplayConfigurationChange

Bug: 233752445
Test: Camera CTS
Change-Id: I3d37f0f6034e929a0bf3321ba122fffbd21fa923
parent a2ac684a
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment