diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2013-12-22 02:10:35 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2013-12-22 02:10:35 -0800 |
| commit | 9668aa26ef0bfcc2ade378029392647d0667badf (patch) | |
| tree | e1fb5245ee911e9357eac5c4e9014acd1ed6d5e2 /src | |
| parent | 2d8125cc3d719a4a7307c209b2dbe46f123eeb88 (diff) | |
| parent | d37c1f6017e8dff1de61072475bc93d1c46f9ea6 (diff) | |
| download | android_packages_apps_Snap-9668aa26ef0bfcc2ade378029392647d0667badf.tar.gz android_packages_apps_Snap-9668aa26ef0bfcc2ade378029392647d0667badf.tar.bz2 android_packages_apps_Snap-9668aa26ef0bfcc2ade378029392647d0667badf.zip | |
Merge "Set original camera parameters while switching between modules."
Diffstat (limited to 'src')
| -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; |