From d37c1f6017e8dff1de61072475bc93d1c46f9ea6 Mon Sep 17 00:00:00 2001
From: Santhosh Kumar H E <skhara@codeaurora.org>
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 +-
 src/com/android/camera/VideoModule.java             | 7 -------
 src/com/android/camera/WideAnglePanoramaModule.java | 7 -------
 3 files changed, 1 insertion(+), 15 deletions(-)

(limited to 'src')

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.");
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index a87786a29..0964bd4e9 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -223,13 +223,6 @@ public class VideoModule implements CameraModule,
             return;
         }
         mParameters = mCameraDevice.getParameters();
-        String sceneMode = mParameters.getSceneMode();
-        if ((null != sceneMode) && (!sceneMode.equals(Parameters.SCENE_MODE_AUTO))){
-            if (CameraUtil.isSupported(Parameters.SCENE_MODE_AUTO,
-                                           mParameters.getSupportedSceneModes())){
-                mParameters.setSceneMode(Parameters.SCENE_MODE_AUTO);
-            }
-        }
     }
 
     //QCOM data Members Starts here
diff --git a/src/com/android/camera/WideAnglePanoramaModule.java b/src/com/android/camera/WideAnglePanoramaModule.java
index 2a7ac9650..c5629fd22 100644
--- a/src/com/android/camera/WideAnglePanoramaModule.java
+++ b/src/com/android/camera/WideAnglePanoramaModule.java
@@ -330,13 +330,6 @@ public class WideAnglePanoramaModule
             return false;
         }
         Parameters parameters = mCameraDevice.getParameters();
-        String sceneMode = parameters.getSceneMode();
-        if ((null != sceneMode) && (!sceneMode.equals(Parameters.SCENE_MODE_AUTO))){
-            if (CameraUtil.isSupported(Parameters.SCENE_MODE_AUTO,
-                                           parameters.getSupportedSceneModes())){
-                parameters.setSceneMode(Parameters.SCENE_MODE_AUTO);
-            }
-        }
         setupCaptureParams(parameters);
         configureCamera(parameters);
         return true;
-- 
cgit v1.2.3