diff options
| author | Emilian Peev <epeevs@codeaurora.org> | 2014-12-04 17:00:38 +0200 |
|---|---|---|
| committer | Emilian Peev <epeevs@codeaurora.org> | 2015-03-05 18:17:13 +0200 |
| commit | 51bbe05b25fcb9b3cd35bd79f100e420b01bd5f6 (patch) | |
| tree | 1af3e3cf22e81008fce0da2cfc77b4f5c8c62ecc /src | |
| parent | 2d894ed368689085e89b6f0b79fb355575267e97 (diff) | |
| download | android_packages_apps_Snap-51bbe05b25fcb9b3cd35bd79f100e420b01bd5f6.tar.gz android_packages_apps_Snap-51bbe05b25fcb9b3cd35bd79f100e420b01bd5f6.tar.bz2 android_packages_apps_Snap-51bbe05b25fcb9b3cd35bd79f100e420b01bd5f6.zip | |
Camera: Avoid state switch during preview start
If snapshot is running avoid changing the
camera application state during handling of
'ON_PREVIEW_STARTED' messages.
Change-Id: I1654752d431d41d3219f235a08f77e1d7dd10c27
CRs-Fixed: 747816
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 72e0f3f4d..a915d0845 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -533,6 +533,9 @@ public class PhotoModule } private void onPreviewStarted() { + if (mCameraState == SNAPSHOT_IN_PROGRESS) { + return; + } mUI.hidePreviewCover(); setCameraState(IDLE); mFocusManager.onPreviewStarted(); |