diff options
Diffstat (limited to 'services')
| -rw-r--r-- | services/camera/libcameraservice/CameraService.cpp | 18 | ||||
| -rw-r--r-- | services/camera/libcameraservice/CameraService.h | 4 | ||||
| -rw-r--r-- | services/java/com/android/server/EntropyService.java | 1 |
3 files changed, 17 insertions, 6 deletions
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index ea2c5d4..58209fd 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp @@ -319,6 +319,7 @@ CameraService::Client::Client(const sp<CameraService>& cameraService, // Callback is disabled by default mPreviewCallbackFlag = FRAME_CALLBACK_FLAG_NOOP; mOrientation = 0; + mOrientationChanged = false; cameraService->setCameraBusy(cameraId); cameraService->loadSound(); LOG1("Client::Client X (pid %d)", callingPid); @@ -496,6 +497,7 @@ status_t CameraService::Client::setPreviewDisplay(const sp<ISurface>& surface) { // Force the destruction of any previous overlay sp<Overlay> dummy; mHardware->setOverlay(dummy); + mOverlayRef = 0; } else { mSurface->unregisterBuffers(); } @@ -539,11 +541,12 @@ status_t CameraService::Client::setOverlay() { CameraParameters params(mHardware->getParameters()); params.getPreviewSize(&w, &h); - if (w != mOverlayW || h != mOverlayH) { + if (w != mOverlayW || h != mOverlayH || mOrientationChanged) { // Force the destruction of any previous overlay sp<Overlay> dummy; mHardware->setOverlay(dummy); mOverlayRef = 0; + mOrientationChanged = false; } status_t result = NO_ERROR; @@ -810,6 +813,7 @@ String8 CameraService::Client::getParameters() const { status_t CameraService::Client::sendCommand(int32_t cmd, int32_t arg1, int32_t arg2) { LOG1("sendCommand (pid %d)", getCallingPid()); + int orientation; Mutex::Autolock lock(mLock); status_t result = checkPidAndHardware(); if (result != NO_ERROR) return result; @@ -821,20 +825,24 @@ status_t CameraService::Client::sendCommand(int32_t cmd, int32_t arg1, int32_t a } switch (arg1) { case 0: - mOrientation = ISurface::BufferHeap::ROT_0; + orientation = ISurface::BufferHeap::ROT_0; break; case 90: - mOrientation = ISurface::BufferHeap::ROT_90; + orientation = ISurface::BufferHeap::ROT_90; break; case 180: - mOrientation = ISurface::BufferHeap::ROT_180; + orientation = ISurface::BufferHeap::ROT_180; break; case 270: - mOrientation = ISurface::BufferHeap::ROT_270; + orientation = ISurface::BufferHeap::ROT_270; break; default: return BAD_VALUE; } + if (mOrientation != orientation) { + mOrientation = orientation; + if (mOverlayRef != 0) mOrientationChanged = true; + } return OK; } 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; diff --git a/services/java/com/android/server/EntropyService.java b/services/java/com/android/server/EntropyService.java index 81ae26f..0f1fc78 100644 --- a/services/java/com/android/server/EntropyService.java +++ b/services/java/com/android/server/EntropyService.java @@ -139,6 +139,7 @@ public class EntropyService extends Binder { out.println(SystemProperties.get("ro.bootloader")); out.println(SystemProperties.get("ro.hardware")); out.println(SystemProperties.get("ro.revision")); + out.println(new Object().hashCode()); out.println(System.currentTimeMillis()); out.println(System.nanoTime()); } catch (IOException e) { |