From 72869bfe2d4474fe7653877422bfd06bd88fff6d Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Fri, 16 Feb 2018 15:20:48 +0100 Subject: Do not crash if we don't have support for RAW files Change-Id: I179e2a430b6ea790d6b4a68b124944e09f4b1715 --- src/com/android/camera/CaptureModule.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 6581b4568..3766c8209 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -3112,7 +3112,9 @@ public class CaptureModule implements CameraModule, PhotoController, mSupportedMaxPictureSize = prevSizes[0]; Size[] rawSize = mSettingsManager.getSupportedOutputSize(getMainCameraId(), ImageFormat.RAW10); - mSupportedRawPictureSize = rawSize[0]; + if (rawSize != null) { + mSupportedRawPictureSize = rawSize[0]; + } mPreviewSize = getOptimalPreviewSize(mPictureSize, prevSizes); Size[] thumbSizes = mSettingsManager.getSupportedThumbnailSizes(getMainCameraId()); mPictureThumbSize = getOptimalPreviewSize(mPictureSize, thumbSizes); // get largest thumb size -- cgit v1.2.3