summaryrefslogtreecommitdiff
path: root/src/com/android/camera/CaptureModule.java
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2019-02-19 23:47:17 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2019-02-19 23:47:28 -0800
commit7ea3d0eb2d116d619ed34efc742d13b8a271d2ee (patch)
tree6dc4f8f502f9667ab20b79fc3ef985e0f58bd025 /src/com/android/camera/CaptureModule.java
parentecf49d87dc4fa6570c49428e31a19ac88ead0c97 (diff)
parent1cd6cc0d841c06fa8a79de4519b77394b5d468ac (diff)
Merge "Fix issue of that session isn't created" into camera-SnapdragonCamera.lnx.3.0
Diffstat (limited to 'src/com/android/camera/CaptureModule.java')
-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 f5a90b8e1..7c7d0159d 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -3061,7 +3061,7 @@ public class CaptureModule implements CameraModule, PhotoController,
}
Log.d(TAG, "Closing camera: " + mCameraDevice[i].getId());
- if (isAbortCapturesEnable()) {
+ if (isAbortCapturesEnable() && mCaptureSession[i] != null) {
mCaptureSession[i].abortCaptures();
Log.d(TAG, "Closing camera call abortCaptures ");
}