Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix deadlock if the last reference of ICameraClient is removed in ICamera::connect()" into kraken

Browse Source
This commit is contained in:
Chih-Chung Chang
2010-05-14 12:05:06 -07:00
committed by Android (Google) Code Review
parent 6c034325a8 553447b8ff
commit 29f5d9b61d
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libs/camera/Camera.cpp
View File

@@ -92,7 +92,12 @@ void Camera::init()
Camera::~Camera() Camera::~Camera()
{ {
disconnect(); // We don't need to call disconnect() here because if the CameraService
// thinks we are the owner of the hardware, it will hold a (strong)
// reference to us, and we can't possibly be here. We also don't want to
// call disconnect() here if we are in the same process as mediaserver,
// because we may be invoked by CameraService::Client::connect() and will
// deadlock if we call any method of ICamera here.
} }
int32_t Camera::getNumberOfCameras() int32_t Camera::getNumberOfCameras()