summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorjunjiez <junjiez@codeaurora.org>2018-11-06 15:15:05 +0800
committerGerrit - the friendly Code Review server <code-review@localhost>2018-11-14 21:54:30 -0800
commit5e93305f502de7d7333d38c6707ae4801891cd3b (patch)
tree6c5e8fe17ddf9397d0a6e34f6ad3311d430d245f /src
parent78b730055695188e43819ddf108b63021c9d7d7c (diff)
downloadandroid_packages_apps_Snap-5e93305f502de7d7333d38c6707ae4801891cd3b.tar.gz
android_packages_apps_Snap-5e93305f502de7d7333d38c6707ae4801891cd3b.tar.bz2
android_packages_apps_Snap-5e93305f502de7d7333d38c6707ae4801891cd3b.zip
SnapdraongCamera:Fix invalid ImageReader
make sure the needed ImageReaders are valid in captureStillPicture to avoid NP Change-Id: I28525ae5951c548fc06800bb62a3030dccc76b48 CRs-Fixed: 2344071
Diffstat (limited to 'src')
-rwxr-xr-xsrc/com/android/camera/CaptureModule.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 5ec6f5be9..1a5e31c94 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -2172,8 +2172,11 @@ public class CaptureModule implements CameraModule, PhotoController,
} else if(id == getMainCameraId() && mPostProcessor.isFilterOn()) { // Case of post filtering
captureStillPictureForFilter(captureBuilder, id);
} else {
- captureBuilder.addTarget(mImageReader[id].getSurface());
- if (mSaveRaw) {
+ if (mImageReader[id] != null) {
+ captureBuilder.addTarget(mImageReader[id].getSurface());
+ }
+
+ if (mSaveRaw && mRawImageReader[id] != null) {
captureBuilder.addTarget(mRawImageReader[id].getSurface());
}