Revert "Camera: Propagate power mode selection from UI to lower layers."

This reverts commit 5302d2e099de0ae1c3cb4a9cda993fe28b0e8c46, runtime
power-mode changes are causing stability issues in camcorder

Change-Id: I118f7c47bea2d07296dc18ed8a3a790eef592ca2

Revert "SnapdragonCamera: Disable LPM if DIS/Flip are enabled."

This reverts commit 6cd860119a45b4a44d3e1314981862d9dac47955.

Revert "SnapdragonCamera: Set low power mode by default."

This reverts commit d4fccc04331a6a5a7038a542f7d17ecefa4ac95a.

Revert "SnapdragonCamera: Enable low power mode in Camera."

This reverts commit 195fccbe69e92b0312822aa762bb53d301c0f56f.

Change-Id: I623626e60efc850fe182e54d9e9997ca41275579

[mikeioannina]: Remove the now obsolete power mode setting and
unhide the video snapshot size setting

Change-Id: I118f7c47bea2d07296dc18ed8a3a790eef592ca2

1 files changed, 0 insertions, 23 deletions

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 53468eb7f..825e3eddd 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -357,9 +357,6 @@ public class PhotoModule
     private int mJpegFileSizeEstimation = 0;
     private int mRemainingPhotos = -1;
 
-    //settings, which if enabled, need to turn off low power mode
-    private boolean mIsFlipEnabled = false;
-
     private MediaSaveService.OnMediaSavedListener mOnMediaSavedListener =
             new MediaSaveService.OnMediaSavedListener() {
                 @Override
@@ -1948,7 +1945,6 @@ public class PhotoModule
             if (mParameters != null && mCameraDevice != null && mCameraState == IDLE) {
                 Log.v(TAG, "onOrientationChanged, update parameters");
                 setFlipValue();
-                updatePowerMode();
                 mCameraDevice.setParameters(mParameters);
             }
             mUI.setOrientation(mOrientation, true);
@@ -3304,8 +3300,6 @@ public class PhotoModule
             mParameters.setFlashMode(fMode);
         }
 
-        updatePowerMode();
-
         mLongShotMaxSnap = SystemProperties.getInt(PERSIST_LONGSHOT_MAX_SNAP, -1);
         mParameters.set("max-longshot-snap",mLongShotMaxSnap);
     }
@@ -3370,12 +3364,6 @@ public class PhotoModule
         if(CameraUtil.isSupported(picture_flip, CameraSettings.getSupportedFlipMode(mParameters))){
             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;
-        }
     }
 
     @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
@@ -4472,17 +4460,6 @@ public class PhotoModule
         return mLastPhotoTakenWithRefocus;
     }
 
-    private void updatePowerMode() {
-        String lpmSupported = mParameters.get("low-power-mode-supported");
-        if ((lpmSupported != null) && "true".equals(lpmSupported)) {
-            if (!mIsFlipEnabled) {
-                mParameters.set("low-power-mode", "enable");
-            } else {
-                mParameters.set("low-power-mode", "disable");
-            }
-        }
-    }
-
     public boolean isLongshotDone() {
         return ((mCameraState == LONGSHOT) && (mLongshotSnapNum == mReceivedSnapNum) &&
                 !mLongshotActive);