diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-03-17 17:53:09 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-03-17 17:53:09 -0700 |
| commit | ebb7945b87d7feab994e88e9ca666b9f2e173763 (patch) | |
| tree | ff824cc72bae489caa72ed2706f9b0bd9bd1fe36 /src | |
| parent | 4052ea1c2ac2d38fe83f3f337cda8d75459ff702 (diff) | |
| parent | 51bbe05b25fcb9b3cd35bd79f100e420b01bd5f6 (diff) | |
| download | android_packages_apps_Snap-ebb7945b87d7feab994e88e9ca666b9f2e173763.tar.gz android_packages_apps_Snap-ebb7945b87d7feab994e88e9ca666b9f2e173763.tar.bz2 android_packages_apps_Snap-ebb7945b87d7feab994e88e9ca666b9f2e173763.zip | |
Merge "Camera: Avoid state switch during preview start"
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 1a51bd0b5..887982156 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(); |