diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-06-08 08:13:07 -0600 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2015-06-08 08:13:07 -0600 |
| commit | b0ea048bd5a7a5f05353a03e46c68a9033f436de (patch) | |
| tree | 66079f700f38cfbfe99977120c75eff13a9745f7 | |
| parent | 57d77499b09d207187c8a1051bf043ba9fb43c84 (diff) | |
| parent | 9a0d0cbc63632d50c03bbd18597a3b8db1d83303 (diff) | |
| download | android_packages_apps_Snap-b0ea048bd5a7a5f05353a03e46c68a9033f436de.tar.gz android_packages_apps_Snap-b0ea048bd5a7a5f05353a03e46c68a9033f436de.tar.bz2 android_packages_apps_Snap-b0ea048bd5a7a5f05353a03e46c68a9033f436de.zip | |
Merge 9a0d0cbc63632d50c03bbd18597a3b8db1d83303 on remote branch
Change-Id: I17e24633ed9618c9bffb89703e15b5fe3faa067d
| -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 273c205f7..418b90fac 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(); |