summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/CameraSource.cpp
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2011-08-05 17:19:29 -0700
committerJames Dong <jdong@google.com>2011-08-05 17:19:29 -0700
commit334d097870eefeb45137b6df026f7db861d47663 (patch)
treeeb7d444d20f9f32bbf75bcd82a5ce7dba7ad8eae /media/libstagefright/CameraSource.cpp
parentea7c2fea6a031d37270cb5b22b432729626b266d (diff)
downloadframeworks_av-334d097870eefeb45137b6df026f7db861d47663.zip
frameworks_av-334d097870eefeb45137b6df026f7db861d47663.tar.gz
frameworks_av-334d097870eefeb45137b6df026f7db861d47663.tar.bz2
Do not release recording frames if camera is gone
Change-Id: Ia6038c1a3ca17207e43a955ec47c42cdff1f5a76 related-to-bug: 5129465
Diffstat (limited to 'media/libstagefright/CameraSource.cpp')
-rwxr-xr-xmedia/libstagefright/CameraSource.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/CameraSource.cpp b/media/libstagefright/CameraSource.cpp
index ea8eaa4..ac3565f 100755
--- a/media/libstagefright/CameraSource.cpp
+++ b/media/libstagefright/CameraSource.cpp
@@ -665,7 +665,7 @@ void CameraSource::releaseRecordingFrame(const sp<IMemory>& frame) {
LOGV("releaseRecordingFrame");
if (mCameraRecordingProxy != NULL) {
mCameraRecordingProxy->releaseRecordingFrame(frame);
- } else {
+ } else if (mCamera != NULL) {
int64_t token = IPCThreadState::self()->clearCallingIdentity();
mCamera->releaseRecordingFrame(frame);
IPCThreadState::self()->restoreCallingIdentity(token);