commit 0a5825edf5490588d730cae7d9bb7461ad0b29a5
author James Dong <jdong@google.com> Fri Aug 05 17:19:29 2011 -0700
committer James Dong <jdong@google.com> Fri Aug 05 17:19:29 2011 -0700
tree b1cb32e71966f67570571f0d2d30f314dcef5a1d
parent bd391ba1f24409d889d3fb84651f8c81edcd659e

Do not release recording frames if camera is gone

Change-Id: Ia6038c1a3ca17207e43a955ec47c42cdff1f5a76
related-to-bug: 5129465

media/libstagefright/CameraSource.cpp

diff --git a/media/libstagefright/CameraSource.cpp b/media/libstagefright/CameraSource.cpp
index ea8eaa4..ac3565f6 100755
--- a/media/libstagefright/CameraSource.cpp
+++ b/media/libstagefright/CameraSource.cpp
@@ -665,7 +665,7 @@
     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);