Camera2: Inverted preview in Panorama

For 8x26MTP device, panorama preview is coming as inverted.
In present android version flippreview is itself taking care of
rotation. This additional rotation is causing the inverted preview
for the device where mount angle for sensor is more than 180degree.
The logic related to mPanoAngle is not needed which had been
added for previous android version.

Change-Id: I6c5ed526382e0971e555a70946adb63a2acdf180
CRs-Fixed: 591767

1 files changed, 3 insertions, 5 deletions

diff --git a/src/com/android/camera/WideAnglePanoramaModule.java b/src/com/android/camera/WideAnglePanoramaModule.java
index c5629fd22..d8d980533 100644
--- a/src/com/android/camera/WideAnglePanoramaModule.java
+++ b/src/com/android/camera/WideAnglePanoramaModule.java
@@ -130,7 +130,6 @@ public class WideAnglePanoramaModule
     private int mDeviceOrientation;
     private int mDeviceOrientationAtCapture;
     private int mCameraOrientation;
-    private int mPanoAngle;
     private int mOrientationCompensation;
 
     private SoundClips.Player mSoundPlayer;
@@ -657,9 +656,9 @@ public class WideAnglePanoramaModule
         if (mUsingFrontCamera) {
             // mCameraOrientation is negative with respect to the front facing camera.
             // See document of android.hardware.Camera.Parameters.setRotation.
-            orientation = (mDeviceOrientationAtCapture - mCameraOrientation - mPanoAngle + 360) % 360;
+            orientation = (mDeviceOrientationAtCapture - mCameraOrientation - 360) % 360;
         } else {
-            orientation = (mDeviceOrientationAtCapture + mCameraOrientation - mPanoAngle) % 360;
+            orientation = (mDeviceOrientationAtCapture + mCameraOrientation) % 360;
         }
         return orientation;
     }
@@ -1005,8 +1004,7 @@ public class WideAnglePanoramaModule
             // as Panoroma will add 90 degree rotation compensation during
             // postprocessing, we need to consider both camera mount angle and
             // this compensation angle
-            mPanoAngle = (mCameraOrientation - 90 + 360) % 360;
-            mCameraDevice.setDisplayOrientation(mPanoAngle);
+            mCameraDevice.setDisplayOrientation(0);
 
             if (mCameraTexture != null)
             mCameraTexture.setOnFrameAvailableListener(this);