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

am 281acf42: Merge change I52479480 into eclair

Browse Source 
Merge commit '281acf421f4b977add75d736d1083413e1d5f24a' into eclair-mr2

* commit '281acf421f4b977add75d736d1083413e1d5f24a':
  Retry overlay create if it fails. Bug 2153980.
This commit is contained in:
Dave Sparks
2009-10-07 21:14:19 -07:00
committed by Android Git Automerger
parent 48289b2e89 281acf421f
commit ec83852a19
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
camera/libcameraservice/CameraService.cpp
View File

@@ -563,7 +563,19 @@ status_t CameraService::Client::setOverlay()
status_t ret = NO_ERROR; status_t ret = NO_ERROR;
if (mSurface != 0) { if (mSurface != 0) {
if (mOverlayRef.get() == NULL) { if (mOverlayRef.get() == NULL) {
mOverlayRef = mSurface->createOverlay(w, h, OVERLAY_FORMAT_DEFAULT);
// FIXME:
// Surfaceflinger may hold onto the previous overlay reference for some
// time after we try to destroy it. retry a few times. In the future, we
// should make the destroy call block, or possibly specify that we can
// wait in the createOverlay call if the previous overlay is in the
// process of being destroyed.
for (int retry = 0; retry < 50; ++retry) {
mOverlayRef = mSurface->createOverlay(w, h, OVERLAY_FORMAT_DEFAULT);
if (mOverlayRef != NULL) break;
LOGD("Overlay create failed - retrying");
usleep(20000);
}
if ( mOverlayRef.get() == NULL ) if ( mOverlayRef.get() == NULL )
{ {
LOGE("Overlay Creation Failed!"); LOGE("Overlay Creation Failed!");