summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xsrc/com/android/camera/CaptureModule.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index b2ebc34be..1e000916b 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -1501,7 +1501,8 @@ public class CaptureModule implements CameraModule, PhotoController,
@Override
public void onConfigured(CameraCaptureSession cameraCaptureSession) {
- if (mPaused || null == mCameraDevice[id]) {
+ if (mPaused || null == mCameraDevice[id] ||
+ cameraCaptureSession == null) {
return;
}
Log.i(TAG, "cameracapturesession - onConfigured "+ id);