From 9bb976e1c78048081cf9df4d8a1db67311413e5b Mon Sep 17 00:00:00 2001
From: Robert Shih <robertshih@google.com>
Date: Fri, 22 Nov 2013 12:58:43 -0800
Subject: Avoid the call to CameraSourceTimeLapse::trySettingVideoSize if
 initialization failed in the parent class ctor CameraSource::CameraSource.

Bug: 11636771
Change-Id: I5e6bffc1ebeeb1c2b84d6ed2049b2b3676ac046a
---
 media/libstagefright/CameraSourceTimeLapse.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'media/libstagefright/CameraSourceTimeLapse.cpp')

diff --git a/media/libstagefright/CameraSourceTimeLapse.cpp b/media/libstagefright/CameraSourceTimeLapse.cpp
index 20214e8..07f0271 100644
--- a/media/libstagefright/CameraSourceTimeLapse.cpp
+++ b/media/libstagefright/CameraSourceTimeLapse.cpp
@@ -81,7 +81,8 @@ CameraSourceTimeLapse::CameraSourceTimeLapse(
     mVideoWidth = videoSize.width;
     mVideoHeight = videoSize.height;
 
-    if (!trySettingVideoSize(videoSize.width, videoSize.height)) {
+    if (OK == mInitCheck && !trySettingVideoSize(videoSize.width, videoSize.height)) {
+        releaseCamera();
         mInitCheck = NO_INIT;
     }
 
-- 
cgit v1.1