diff options
| -rw-r--r-- | src/com/android/camera/Camera.java | 5 | ||||
| -rw-r--r-- | src/com/android/camera/VideoCamera.java | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index 4008f82..3059a56 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -1580,7 +1580,6 @@ public class Camera extends NoSearchActivity implements View.OnClickListener, private void ensureCameraDevice() throws CameraHardwareException { if (mCameraDevice == null) { mCameraDevice = CameraHolder.instance().open(mCameraId); - Util.setCameraDisplayOrientation(this, mCameraId, mCameraDevice); mInitialParams = mCameraDevice.getParameters(); } } @@ -1639,11 +1638,9 @@ public class Camera extends NoSearchActivity implements View.OnClickListener, if (mPreviewing) stopPreview(); setPreviewDisplay(mSurfaceHolder); + Util.setCameraDisplayOrientation(this, mCameraId, mCameraDevice); setCameraParameters(UPDATE_PARAM_ALL); - final long wallTimeStart = SystemClock.elapsedRealtime(); - final long threadTimeStart = Debug.threadCpuTimeNanos(); - mCameraDevice.setErrorCallback(mErrorCallback); try { diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java index 59f6ab9..1d19561 100644 --- a/src/com/android/camera/VideoCamera.java +++ b/src/com/android/camera/VideoCamera.java @@ -636,12 +636,12 @@ public class VideoCamera extends NoSearchActivity // If the activity is paused and resumed, camera device has been // released and we need to open the camera. mCameraDevice = CameraHolder.instance().open(mCameraId); - Util.setCameraDisplayOrientation(this, mCameraId, mCameraDevice); } mCameraDevice.lock(); - setCameraParameters(); setPreviewDisplay(mSurfaceHolder); + Util.setCameraDisplayOrientation(this, mCameraId, mCameraDevice); + setCameraParameters(); try { mCameraDevice.startPreview(); |