From f3d1d5be8b4c97769ee750efefdb23aebc833a30 Mon Sep 17 00:00:00 2001 From: Cristoforo Cataldo Date: Mon, 15 Dec 2014 07:40:55 +0100 Subject: camera2: Fix null pointer exception while initializing max zoom ratio Before initializing the max zoom ratio, we should check if the zoom feature is supported by the currently used camera. Some old legacy front cameras don't have zoom feature and the camera app, without this commit, throws an error because of the null pointer exception. Change-Id: I479ed6a33b8aba1ab2219d409fcd1b35179d0ee0 --- .../com/android/ex/camera2/portability/AndroidCameraCapabilities.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java index 84b44e6..85b20dd 100644 --- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java +++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java @@ -47,7 +47,8 @@ class AndroidCameraCapabilities extends CameraCapabilities { mPreferredPreviewSizeForVideo = new Size(p.getPreferredPreviewSizeForVideo()); mSupportedPreviewFormats.addAll(p.getSupportedPreviewFormats()); mSupportedPhotoFormats.addAll(p.getSupportedPictureFormats()); - mMaxZoomRatio = p.getZoomRatios().get(p.getMaxZoom()) / ZOOM_MULTIPLIER; + mMaxZoomRatio = p.isZoomSupported() ? + p.getZoomRatios().get(p.getMaxZoom()) / ZOOM_MULTIPLIER : ZOOM_RATIO_UNZOOMED; mHorizontalViewAngle = p.getHorizontalViewAngle(); mVerticalViewAngle = p.getVerticalViewAngle(); buildPreviewFpsRange(p); -- cgit v1.2.3