diff options
| author | Camera Software Integration <camswint@localhost> | 2016-09-21 08:09:29 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-09-21 08:09:29 -0700 |
| commit | bbcb7af8695ddf3a0d3cad0c2888891647b11029 (patch) | |
| tree | 2ed62eded61886676249b81af4001502cbd598be /src/com/android/camera/PhotoModule.java | |
| parent | 309d5c28374c121d27ee80d09212786078e0ff29 (diff) | |
| parent | 0bcd901f4c99038c351a94fea9251693c307c077 (diff) | |
| download | android_packages_apps_Snap-bbcb7af8695ddf3a0d3cad0c2888891647b11029.tar.gz android_packages_apps_Snap-bbcb7af8695ddf3a0d3cad0c2888891647b11029.tar.bz2 android_packages_apps_Snap-bbcb7af8695ddf3a0d3cad0c2888891647b11029.zip | |
Merge "SnapdragonCamera:Fix RuntimeException in monkey test" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index ca4f30bb9..c16bfe76b 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1639,6 +1639,7 @@ public class PhotoModule // is full then ignore. if (mCameraDevice == null || mCameraState == SNAPSHOT_IN_PROGRESS || mCameraState == SWITCHING_CAMERA + || mCameraState == PREVIEW_STOPPED || mActivity.getMediaSaveService() == null || mActivity.getMediaSaveService().isQueueFull()) { return false; |