summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2018-02-16 15:20:48 +0100
committerBruno Martins <bgcngm@gmail.com>2018-11-20 12:32:17 +0000
commit6a28c6474e7080bde0726f93358c17b9b2656248 (patch)
treefb730f1fd2de647f36d9fdfbec2303beb67feddb
parent873c11a8e3ef2fff9c957812f8600c524d1b39ce (diff)
downloadandroid_packages_apps_Snap-6a28c6474e7080bde0726f93358c17b9b2656248.tar.gz
android_packages_apps_Snap-6a28c6474e7080bde0726f93358c17b9b2656248.tar.bz2
android_packages_apps_Snap-6a28c6474e7080bde0726f93358c17b9b2656248.zip
Do not crash if we don't have support for RAW files
Change-Id: I179e2a430b6ea790d6b4a68b124944e09f4b1715
-rwxr-xr-xsrc/com/android/camera/CaptureModule.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 9dcee8b75..b0883a175 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -3769,7 +3769,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