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

Commit c0a88d89 authored by Sai Kumar Sanagavarapu's avatar Sai Kumar Sanagavarapu Committed by Steve Kondik
Browse files

CameraService: Change order of client declaration and service lock. 

Camera service lock has to be acquired after client declaration.
Otherwise, deadlock can occur when client destructor tries to
acquire service lock when its already acquired.

Change-Id: I21757325b3cbfdd5ca52c7becdfaa34ffa5bc768
parent 0454fa64

services/camera/libcameraservice/CameraService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -425,8 +425,8 @@ status_t CameraService::connect( 


    sp<Client> client;

    {

        Mutex::Autolock lock(mServiceLock);

        sp<BasicClient> clientTmp;

        Mutex::Autolock lock(mServiceLock);

        if (!canConnectUnsafe(cameraId, clientPackageName,

                              cameraClient->asBinder(),

                              /*out*/clientTmp)) {