1 files changed, 2 insertions, 40 deletions

diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 996166f83..92d9e2986 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -209,10 +209,6 @@ public class VideoModule implements CameraModule,
     private boolean mIsVideoCDSUpdated = false;
     private boolean mOverrideCDS = false;
 
-    //settings, which if enabled, need to turn off low power mode
-    private boolean mIsFlipEnabled = false;
-    private boolean mIsDISEnabled = false;
-
     // The preview window is on focus
     private boolean mPreviewFocused = false;
 
@@ -656,7 +652,6 @@ public class VideoModule implements CameraModule,
             if ((mCameraDevice != null) && (mParameters != null)
                     && (true == mPreviewing) && !mMediaRecorderRecording){
                 setFlipValue();
-                updatePowerMode();
                 mCameraDevice.setParameters(mParameters);
             }
             mUI.setOrientation(newOrientation, true);
@@ -816,18 +811,6 @@ public class VideoModule implements CameraModule,
 
         Log.v(TAG, "Audio Encoder selected = " +mAudioEncoder);
 
-        if(mParameters.isPowerModeSupported()) {
-            String powermode = mPreferences.getString(
-                    CameraSettings.KEY_POWER_MODE,
-                    mActivity.getString(R.string.pref_camera_powermode_default));
-            Log.v(TAG, "read videopreferences power mode =" +powermode);
-            String old_mode = mParameters.getPowerMode();
-            if(!old_mode.equals(powermode) && mPreviewing)
-                mRestartPreview = true;
-
-            mParameters.setPowerMode(powermode);
-        }
-
         // Set wavelet denoise mode
         if (mParameters.getSupportedDenoiseModes() != null) {
             String denoise = mPreferences.getString(CameraSettings.KEY_DENOISE,
@@ -2253,11 +2236,7 @@ public class VideoModule implements CameraModule,
             mParameters.set(CameraSettings.KEY_QC_SNAPSHOT_PICTURE_FLIP, picture_flip);
         }
 
-        if ((preview_flip_value != 0) || (video_flip_value != 0) || (picture_flip_value != 0)) {
-            mIsFlipEnabled = true;
-        } else {
-            mIsFlipEnabled = false;
-        }
+
     }
 
      private void qcomSetCameraParameters(){
@@ -2276,7 +2255,6 @@ public class VideoModule implements CameraModule,
                 CameraSettings.KEY_DIS,
                 mActivity.getString(R.string.pref_camera_dis_default));
         Log.v(TAG, "DIS value =" + disMode);
-        mIsDISEnabled = disMode.equals("enable");
 
         if (is4KEnabled()) {
             if (isSupported(mActivity.getString(R.string.pref_camera_dis_value_disable),
@@ -2531,7 +2509,6 @@ public class VideoModule implements CameraModule,
                                Toast.LENGTH_LONG).show();
                 mParameters.set(CameraSettings.KEY_QC_DIS_MODE, "disable");
                 mUI.overrideSettings(CameraSettings.KEY_DIS,"disable");
-                mIsDISEnabled = false;
             }
         }
         //setting video rotation
@@ -2542,10 +2519,7 @@ public class VideoModule implements CameraModule,
             mParameters.setVideoRotation(videoRotation);
         }
 
-        //set power mode settings
-        updatePowerMode();
     }
-
     @SuppressWarnings("deprecation")
     private void setCameraParameters() {
         Log.d(TAG,"Preview dimension in App->"+mDesiredPreviewWidth+"X"+mDesiredPreviewHeight);
@@ -2712,7 +2686,7 @@ public class VideoModule implements CameraModule,
             // We need to restart the preview if preview size is changed.
             Size size = mParameters.getPreviewSize();
             if (size.width != mDesiredPreviewWidth
-                    || size.height != mDesiredPreviewHeight || mRestartPreview) {
+                    || size.height != mDesiredPreviewHeight) {
 
                 stopPreview();
                 resizeForPreviewAspectRatio();
@@ -2720,7 +2694,6 @@ public class VideoModule implements CameraModule,
             } else {
                 setCameraParameters();
             }
-            mRestartPreview = false;
             mUI.updateOnScreenIndicators(mParameters, mPreferences);
             Storage.setSaveSDCard(
                 mPreferences.getString(CameraSettings.KEY_CAMERA_SAVEPATH, "0").equals("1"));
@@ -2984,15 +2957,4 @@ public class VideoModule implements CameraModule,
         resumeVideoRecording();
     }
 
-    private void updatePowerMode() {
-        String lpmSupported = mParameters.get("low-power-mode-supported");
-        if ((lpmSupported != null) && "true".equals(lpmSupported)) {
-            if (!mIsDISEnabled && !mIsFlipEnabled) {
-                mParameters.set("low-power-mode", "enable");
-            } else {
-                mParameters.set("low-power-mode", "disable");
-            }
-        }
-    }
-
 }