diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2010-09-23 17:17:43 -0700 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2010-09-27 11:49:56 -0700 |
| commit | 4a73f3da3501db6e95473a4a653d6319c6d618e2 (patch) | |
| tree | 0083cf53310b1a1ebf15563cf2782c350afcfd3d /services/camera/libcameraservice/CameraService.h | |
| parent | e2dc4aa0578dea9ab8c13ea4b69b7e6d0d1711d8 (diff) | |
| download | frameworks_av-4a73f3da3501db6e95473a4a653d6319c6d618e2.zip frameworks_av-4a73f3da3501db6e95473a4a653d6319c6d618e2.tar.gz frameworks_av-4a73f3da3501db6e95473a4a653d6319c6d618e2.tar.bz2 | |
The old overlay should be destroyed if orientation changes.
Previously the orientation was wrong after suspend and resume.
When the camera app is resumed behide the lock screen, it
orinteation is portrait. When users slide to unlock the screen,
surfaceChanged is called and the orientation is landscape.
The camera app stops the preview, sets the display orientation,
and starts the preview. Overlay should be destroyed if the
orientation has changed.
bug:3031640
Change-Id: I38b527f9ea78c91b538463292152c023383b4695
Diffstat (limited to 'services/camera/libcameraservice/CameraService.h')
| -rw-r--r-- | services/camera/libcameraservice/CameraService.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/CameraService.h b/services/camera/libcameraservice/CameraService.h index 0d69836..8f0ed75 100644 --- a/services/camera/libcameraservice/CameraService.h +++ b/services/camera/libcameraservice/CameraService.h @@ -164,7 +164,9 @@ private: int mOverlayW; int mOverlayH; int mPreviewCallbackFlag; - int mOrientation; + int mOrientation; // Current display orientation + // True if display orientation has been changed. This is only used in overlay. + int mOrientationChanged; // Ensures atomicity among the public methods mutable Mutex mLock; |