Merge "Clean up orientation logging" into ub-camera-glacier
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 9e6299f..f5d697a 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -191,8 +191,6 @@
// The display rotation in degrees. This is only valid when mCameraState is
// not PREVIEW_STOPPED.
private int mDisplayRotation;
- // The value for android.hardware.Camera.setDisplayOrientation.
- private int mCameraDisplayOrientation;
// The value for UI components like indicators.
private int mDisplayOrientation;
// The value for cameradevice.CameraSettings.setPhotoRotationDegrees.
@@ -1305,8 +1303,8 @@
mJpegRotation = info.getJpegOrientation(orientation);
mCameraDevice.setJpegOrientation(mJpegRotation);
- Log.v(TAG, "capture orientation (display:device:used:jpeg) " +
- mDisplayOrientation + ":" + mOrientation + ":" +
+ Log.v(TAG, "capture orientation (screen:device:used:jpeg) " +
+ mDisplayRotation + ":" + mOrientation + ":" +
orientation + ":" + mJpegRotation);
mCameraDevice.takePicture(mHandler,
@@ -1885,7 +1883,6 @@
Characteristics info =
mActivity.getCameraProvider().getCharacteristics(mCameraId);
mDisplayOrientation = info.getPreviewOrientation(mDisplayRotation);
- mCameraDisplayOrientation = mDisplayOrientation;
mUI.setDisplayOrientation(mDisplayOrientation);
if (mFocusManager != null) {
mFocusManager.setDisplayOrientation(mDisplayOrientation);
@@ -1894,9 +1891,8 @@
if (mCameraDevice != null) {
mCameraDevice.setDisplayOrientation(mDisplayRotation);
}
- Log.v(TAG, "setDisplayOrientation (rotation:orientation:display) " +
- mDisplayRotation + ":" + mDisplayOrientation + ":" +
- mDisplayOrientation);
+ Log.v(TAG, "setDisplayOrientation (screen:preview) " +
+ mDisplayRotation + ":" + mDisplayOrientation);
}
/** Only called by UI thread. */