summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rwxr-xr-x[-rw-r--r--]src/com/android/camera/PhotoModule.java3
-rwxr-xr-xsrc/com/android/camera/VideoModule.java3
2 files changed, 1 insertions, 5 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 48fbc11dc..b81e96f0f 100644..100755
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -491,8 +491,6 @@ public class PhotoModule
mPreferences.setLocalId(mActivity, mCameraId);
CameraSettings.upgradeLocalPreferences(mPreferences.getLocal());
- // we need to reset exposure for the preview
- resetExposureCompensation();
initializeControlByIntent();
mQuickCapture = mActivity.getIntent().getBooleanExtra(EXTRA_QUICK_CAPTURE, false);
@@ -2021,7 +2019,6 @@ public class PhotoModule
mJpegPictureCallbackTime = 0;
mZoomValue = 0;
- resetExposureCompensation();
if (!prepareCamera()) {
// Camera failure.
return;
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 30144407c..8223fadf4 100755
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -477,8 +477,7 @@ public class VideoModule implements CameraModule,
private void takeASnapshot() {
// Only take snapshots if video snapshot is supported by device
- if (CameraUtil.isVideoSnapshotSupported(mParameters) && !mIsVideoCaptureIntent
- && !is4KEnabled()) {
+ if (CameraUtil.isVideoSnapshotSupported(mParameters) && !mIsVideoCaptureIntent) {
if (!mMediaRecorderRecording || mPaused || mSnapshotInProgress) {
return;
}