commit 81b91551dfd0f35380094e3434e5358e8d63f0ba
author Linux Build Service Account <lnxbuild@localhost> Fri Sep 19 11:59:46 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Sep 19 11:59:46 2014 -0700
tree 3202b70814559f43b7c53427a718c296602075a4
parent 0fa36eae91e743e85f2942407e6b686cb38ac363
parent ec449be018e9ff0f644d3484e61334a9667f82a6

Merge "SnapdragonCamera: Add HDR need 1x menu selection"

src/com/android/camera/PhotoModule.java

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
old mode 100644
new mode 100755
index 48fbc11..b81e96f
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -491,8 +491,6 @@
 
         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 @@
 
         mJpegPictureCallbackTime = 0;
         mZoomValue = 0;
-        resetExposureCompensation();
         if (!prepareCamera()) {
             // Camera failure.
             return;

src/com/android/camera/VideoModule.java

diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 3014440..8223fad 100755
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -477,8 +477,7 @@
 
     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;
             }