summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSridhar Gujje <sgujje@qti.qualcomm.com>2019-02-04 22:40:02 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2019-02-04 22:40:02 -0800
commit939a47e718464788db5d4c57380a08695aa8b68e (patch)
tree6dc4f8f502f9667ab20b79fc3ef985e0f58bd025
parent3ad01750ae91c0d512701cb6bfc61b5d1edfd56e (diff)
parent8f2fd0858a49c0d2798f66a95fe8faa843d93ccc (diff)
downloadandroid_packages_apps_Snap-939a47e718464788db5d4c57380a08695aa8b68e.tar.gz
android_packages_apps_Snap-939a47e718464788db5d4c57380a08695aa8b68e.tar.bz2
android_packages_apps_Snap-939a47e718464788db5d4c57380a08695aa8b68e.zip
Merge "Fix issue of that session isn't created" into camera-SnapdragonCamera.lnx.2.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 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 ");
}