diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2010-09-27 20:50:22 -0700 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2010-09-27 20:50:22 -0700 |
| commit | b36f2df1daf7e733be7c51f93792f8fc4252544c (patch) | |
| tree | 67cc64d0fd46312a304aafd24cdd1167d793c919 /services/camera/libcameraservice/CameraService.h | |
| parent | 214a2bdcf6f8f26a0218f2d7a8d822c7b3a71d03 (diff) | |
| parent | 2c423a4dc0988e3195c781d56f119514789b604b (diff) | |
| download | frameworks_av-b36f2df1daf7e733be7c51f93792f8fc4252544c.zip frameworks_av-b36f2df1daf7e733be7c51f93792f8fc4252544c.tar.gz frameworks_av-b36f2df1daf7e733be7c51f93792f8fc4252544c.tar.bz2 | |
resolved conflicts for merge of 191a25e1 to master
Change-Id: I6f4940e337a992bf84e50bc1d22432593937499c
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 2b5c511..d57364a 100644 --- a/services/camera/libcameraservice/CameraService.h +++ b/services/camera/libcameraservice/CameraService.h @@ -173,7 +173,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; bool mPlayShutterSound; // Ensures atomicity among the public methods |