diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-06-11 23:50:30 -0600 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2015-06-11 23:50:30 -0600 |
| commit | 642b7c131510fcd8948510ae6865b3b174cc308f (patch) | |
| tree | 1553e37daf2972111893e9d37ee47eae3b158566 | |
| parent | faa6d875d926672fe078101cf67cd9d3ec334445 (diff) | |
| parent | 9a0d0cbc63632d50c03bbd18597a3b8db1d83303 (diff) | |
| download | android_packages_apps_Snap-642b7c131510fcd8948510ae6865b3b174cc308f.tar.gz android_packages_apps_Snap-642b7c131510fcd8948510ae6865b3b174cc308f.tar.bz2 android_packages_apps_Snap-642b7c131510fcd8948510ae6865b3b174cc308f.zip | |
Merge 9a0d0cbc63632d50c03bbd18597a3b8db1d83303 on remote branch
Change-Id: I7c9a290836bb0892d81f7cb329c1d70d298661d5
| -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 79ae073b6..e89a1f839 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -539,6 +539,9 @@ public class PhotoModule } private void onPreviewStarted() { + if (mCameraState == SNAPSHOT_IN_PROGRESS) { + return; + } mUI.hidePreviewCover(); setCameraState(IDLE); mFocusManager.onPreviewStarted(); |