summaryrefslogtreecommitdiffstats
path: root/camera/libcameraservice
diff options
context:
space:
mode:
authorChih-Chung Chang <chihchung@google.com>2010-07-02 07:48:03 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-07-02 07:48:03 -0700
commitac2a934aaea2534e5cc0875d3fef888fe67bcca4 (patch)
tree4cc18a10af7e24308a7c0a571b43fc1adf1f4271 /camera/libcameraservice
parent925a9abb6d03bd28cfd238b2136b202dbf6ac322 (diff)
parent4e459e7676baf68e1c8122af757a165ada8df203 (diff)
downloadframeworks_native-ac2a934aaea2534e5cc0875d3fef888fe67bcca4.zip
frameworks_native-ac2a934aaea2534e5cc0875d3fef888fe67bcca4.tar.gz
frameworks_native-ac2a934aaea2534e5cc0875d3fef888fe67bcca4.tar.bz2
am 7df74471: Merge "Flush binder buffer after setting raw heap to avoid leaking a reference." into froyo
Merge commit '7df7447112371fb5e46f6084b55ac2ccdfde139d' into gingerbread * commit '7df7447112371fb5e46f6084b55ac2ccdfde139d': Flush binder buffer after setting raw heap to avoid leaking a reference.
Diffstat (limited to 'camera/libcameraservice')
-rw-r--r--camera/libcameraservice/CameraService.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/camera/libcameraservice/CameraService.cpp b/camera/libcameraservice/CameraService.cpp
index 75948a5..10668a4 100644
--- a/camera/libcameraservice/CameraService.cpp
+++ b/camera/libcameraservice/CameraService.cpp
@@ -1031,6 +1031,7 @@ void CameraService::Client::handleShutter(image_rect_type *size) {
mHardware->getRawHeap());
mSurface->registerBuffers(buffers);
+ IPCThreadState::self()->flushCommands();
}
mLock.unlock();