From d37c1f6017e8dff1de61072475bc93d1c46f9ea6 Mon Sep 17 00:00:00 2001 From: Santhosh Kumar H E Date: Wed, 11 Dec 2013 12:57:18 +0530 Subject: Set original camera parameters while switching between modules. Camera holder maintains a local variable to get original params and set those params back when user switch between modules. But these parameters were obtained from the instance of camera manager. So object in Camera holder will be a reference to an object in camera manager. Becasue of this all the parameters set in photo module are getting reflected in other modules. This change makes sure the camera holder's parameters object is created separately by getting data from camera device. Also reverted the alternative solution to reset scene mode in video and panorama module. CRs-Fixed: 579747 Change-Id: I02637fb2c215aeb1ba9076629400a339c31178ad --- src/com/android/camera/CameraHolder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/com/android/camera/CameraHolder.java') diff --git a/src/com/android/camera/CameraHolder.java b/src/com/android/camera/CameraHolder.java index e3f2c11e7..0797fad44 100644 --- a/src/com/android/camera/CameraHolder.java +++ b/src/com/android/camera/CameraHolder.java @@ -222,7 +222,7 @@ public class CameraHolder { return null; } mCameraId = cameraId; - mParameters = mCameraDevice.getParameters(); + mParameters = mCameraDevice.getCamera().getParameters(); } else { if (!mCameraDevice.reconnect(handler, cb)) { Log.e(TAG, "fail to reconnect Camera:" + mCameraId + ", aborting."); -- cgit v1.2.3