diff options
author | Wu-cheng Li <wuchengli@google.com> | 2011-10-07 03:08:30 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-07 03:08:30 -0700 |
commit | bc76bb458220f39ed290e2d13180c31bb35ecb90 (patch) | |
tree | 98292ba3310278898273aa76c992bcb9746e45fb | |
parent | ce020a72e78408bc66bbd06993d6a24122846610 (diff) | |
parent | 8d43cb6edb5c0d9ebb1fa0586b738d7832a288b4 (diff) | |
download | system_core-bc76bb458220f39ed290e2d13180c31bb35ecb90.zip system_core-bc76bb458220f39ed290e2d13180c31bb35ecb90.tar.gz system_core-bc76bb458220f39ed290e2d13180c31bb35ecb90.tar.bz2 |
Merge "Allow CAMERA_CMD_SET_DISPLAY_ORIENTATION to change during preview."
-rw-r--r-- | include/system/camera.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/system/camera.h b/include/system/camera.h index 81ce4cb..86b62b7 100644 --- a/include/system/camera.h +++ b/include/system/camera.h @@ -105,8 +105,8 @@ enum { * This does not affect the order of byte array of * CAMERA_MSG_PREVIEW_FRAME, CAMERA_MSG_VIDEO_FRAME, * CAMERA_MSG_POSTVIEW_FRAME, CAMERA_MSG_RAW_IMAGE, or - * CAMERA_MSG_COMPRESSED_IMAGE. This is not allowed to be set during - * preview + * CAMERA_MSG_COMPRESSED_IMAGE. This is allowed to be set during preview + * since API level 14. */ CAMERA_CMD_SET_DISPLAY_ORIENTATION = 3, |