diff options
| author | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-03-10 16:59:51 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-03-10 16:59:51 +0000 |
| commit | 78692bfeeddeb9218cd24940ba6f828f86ee26a2 (patch) | |
| tree | 0fc13fd92643f45f47367ee042360cbfee28b309 /camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java | |
| parent | 9bd171c5eeb3c94cd0c50f3ec6906d706eee7fe8 (diff) | |
| parent | 02ce5a07e060328c367326770f5451e945633aff (diff) | |
| download | android_frameworks_ex-staging/cm-12.1.tar.gz android_frameworks_ex-staging/cm-12.1.tar.bz2 android_frameworks_ex-staging/cm-12.1.zip | |
Merge tag 'android-5.1.0_r1' into HEADstaging/cm-12.1stable/cm-12.1-YOG7Dstable/cm-12.1-YOG4Pstable/cm-12.1-YOG3Ccm-12.1
Android 5.1.0 release 1
Change-Id: I11a3d0ee668ab4fd9ad7f07decbdf99c57024291
Diffstat (limited to 'camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java')
| -rw-r--r-- | camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java | 3 |
1 files changed, 1 insertions, 2 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 85b20dd..9892d4a 100644 --- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java +++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java @@ -47,8 +47,6 @@ class AndroidCameraCapabilities extends CameraCapabilities { mPreferredPreviewSizeForVideo = new Size(p.getPreferredPreviewSizeForVideo()); mSupportedPreviewFormats.addAll(p.getSupportedPreviewFormats()); mSupportedPhotoFormats.addAll(p.getSupportedPictureFormats()); - mMaxZoomRatio = p.isZoomSupported() ? - p.getZoomRatios().get(p.getMaxZoom()) / ZOOM_MULTIPLIER : ZOOM_RATIO_UNZOOMED; mHorizontalViewAngle = p.getHorizontalViewAngle(); mVerticalViewAngle = p.getVerticalViewAngle(); buildPreviewFpsRange(p); @@ -61,6 +59,7 @@ class AndroidCameraCapabilities extends CameraCapabilities { buildWhiteBalances(p); if (p.isZoomSupported()) { + mMaxZoomRatio = p.getZoomRatios().get(p.getMaxZoom()) / ZOOM_MULTIPLIER; mSupportedFeatures.add(Feature.ZOOM); } if (p.isVideoSnapshotSupported()) { |