summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamera Software Integration <camswint@localhost>2016-12-20 02:56:40 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-12-20 02:56:40 -0800
commit656eb79e726d9121cd40e24225094ff99aa55e77 (patch)
tree1c4c79ffe1ac51c716fdf68084b4c3a2c0354f01
parent910b6ef9c0caa64fe83b6ec2ff5687995852e67c (diff)
parent3cbf863eb1c29f4cfd01d96fe7d38c3a1a1928d7 (diff)
downloadandroid_packages_apps_Snap-656eb79e726d9121cd40e24225094ff99aa55e77.tar.gz
android_packages_apps_Snap-656eb79e726d9121cd40e24225094ff99aa55e77.tar.bz2
android_packages_apps_Snap-656eb79e726d9121cd40e24225094ff99aa55e77.zip
Merge "SnapdragonCamera: Fix FC caused by session null" into camera.lnx.1.0-dev.1.0
-rwxr-xr-xsrc/com/android/camera/CaptureModule.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 4d4b1d750..184b03a1d 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -1405,7 +1405,7 @@ public class CaptureModule implements CameraModule, PhotoController,
private void captureVideoSnapshot(final int id) {
Log.d(TAG, "captureStillPicture " + id);
try {
- if (null == mActivity || null == mCameraDevice[id]) {
+ if (null == mActivity || null == mCameraDevice[id] || mCurrentSession == null) {
warningToast("Camera is not ready yet to take a video snapshot.");
return;
}