commit | d0d3c4845bef94bb91e0c346c0f0048ba06be309 | [log] [tgz] |
---|---|---|
author | Sascha Haeberling <haeberling@google.com> | Mon Nov 04 12:11:34 2013 -0800 |
committer | The Android Automerger <android-build@google.com> | Mon Nov 04 14:43:49 2013 -0800 |
tree | 0a72524917ee65b5a21a1d43b682cb9da968c039 | |
parent | 1e8e8cecd02b98c261c7b2fd267f8846dbe90c03 [diff] |
Check for media service being present before capture. Bug: 11508325 Change-Id: I0997f9bff63b1cdb3c33272acc8617b30c07424a
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 09d5dc6..ed13aa5 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java
@@ -869,6 +869,7 @@ // is full then ignore. if (mCameraDevice == null || mCameraState == SNAPSHOT_IN_PROGRESS || mCameraState == SWITCHING_CAMERA + || mActivity.getMediaSaveService() == null || mActivity.getMediaSaveService().isQueueFull()) { return false; }