diff options
| author | Cristoforo Cataldo <cristoforo.cataldo@gmail.com> | 2014-12-15 07:40:55 +0100 |
|---|---|---|
| committer | Cristoforo Cataldo <cristoforo.cataldo@gmail.com> | 2014-12-15 11:07:43 +0100 |
| commit | f3d1d5be8b4c97769ee750efefdb23aebc833a30 (patch) | |
| tree | 88ecc7e248a15e6aa9cb7671618e52c00d27ab78 | |
| parent | f3fddec61b49fbcf94191867f0999e2e3abff27a (diff) | |
| download | android_frameworks_ex-f3d1d5be8b4c97769ee750efefdb23aebc833a30.tar.gz android_frameworks_ex-f3d1d5be8b4c97769ee750efefdb23aebc833a30.tar.bz2 android_frameworks_ex-f3d1d5be8b4c97769ee750efefdb23aebc833a30.zip | |
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
| -rw-r--r-- | camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java | 3 |
1 files changed, 2 insertions, 1 deletions
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); |