Skip to content

Commit b63f8a6

Browse files
author
luowei
committed
Nullpointer when setting picture size parameter in Camera1 google#207
1 parent 5a11ba8 commit b63f8a6

File tree

1 file changed

+10
-4
lines changed
  • library/src/main/api14/com/google/android/cameraview

1 file changed

+10
-4
lines changed

library/src/main/api14/com/google/android/cameraview/Camera1.java

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import android.os.Build;
2323
import android.support.v4.util.SparseArrayCompat;
2424
import android.view.SurfaceHolder;
25-
2625
import java.io.IOException;
2726
import java.util.List;
2827
import java.util.Set;
@@ -331,12 +330,19 @@ void adjustCameraParameters() {
331330
}
332331
Size size = chooseOptimalSize(sizes);
333332

334-
// Always re-apply camera parameters
335-
// Largest picture size in this ratio
336-
final Size pictureSize = mPictureSizes.sizes(mAspectRatio).last();
333+
final Size pictureSize;
334+
if (mPictureSizes.sizes(mAspectRatio) == null) {
335+
pictureSize = size;
336+
} else {
337+
// Largest picture size in this ratio
338+
pictureSize = mPictureSizes.sizes(mAspectRatio).last();
339+
}
340+
337341
if (mShowingPreview) {
338342
mCamera.stopPreview();
339343
}
344+
345+
// Always re-apply camera parameters
340346
mCameraParameters.setPreviewSize(size.getWidth(), size.getHeight());
341347
mCameraParameters.setPictureSize(pictureSize.getWidth(), pictureSize.getHeight());
342348
mCameraParameters.setRotation(calcCameraRotation(mDisplayOrientation));

0 commit comments

Comments
 (0)