diff options
| -rw-r--r-- | src/com/android/camera/CameraHolder.java | 2 | ||||
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 7 | ||||
| -rw-r--r-- | src/com/android/camera/WideAnglePanoramaModule.java | 7 |
3 files changed, 1 insertions, 15 deletions
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; |