diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2011-10-07 03:08:23 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-07 03:08:23 -0700 |
| commit | 3e754efaddf3e221bcae6fe836d7553185d01944 (patch) | |
| tree | 38012e5f87f1da55fca784ebb4dfb14ead3c40a8 /services | |
| parent | e46c970c8f2fc26ff39cf8bebf984f46b17233ba (diff) | |
| parent | b9f588677910cac6ffc0346092bfcfe1c6620b90 (diff) | |
| download | frameworks_av-3e754efaddf3e221bcae6fe836d7553185d01944.zip frameworks_av-3e754efaddf3e221bcae6fe836d7553185d01944.tar.gz frameworks_av-3e754efaddf3e221bcae6fe836d7553185d01944.tar.bz2 | |
Merge "Allow Camera.setDisplayOrientation to be called when preview is active."
Diffstat (limited to 'services')
| -rw-r--r-- | services/camera/libcameraservice/CameraService.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index b178fd9..9f7bd27 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp @@ -849,16 +849,16 @@ status_t CameraService::Client::sendCommand(int32_t cmd, int32_t arg1, int32_t a if (result != NO_ERROR) return result; if (cmd == CAMERA_CMD_SET_DISPLAY_ORIENTATION) { - // The orientation cannot be set during preview. - if (mHardware->previewEnabled()) { - return INVALID_OPERATION; - } // Mirror the preview if the camera is front-facing. orientation = getOrientation(arg1, mCameraFacing == CAMERA_FACING_FRONT); if (orientation == -1) return BAD_VALUE; if (mOrientation != orientation) { mOrientation = orientation; + if (mPreviewWindow != 0) { + native_window_set_buffers_transform(mPreviewWindow.get(), + mOrientation); + } } return OK; } else if (cmd == CAMERA_CMD_ENABLE_SHUTTER_SOUND) { |