diff options
| author | Qiwen Zhao <zhao@google.com> | 2014-11-12 23:50:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-12 23:50:36 +0000 |
| commit | 3f67d845af493927f81889b0ca4087a1c4a9871b (patch) | |
| tree | 84809b1e7f0f81bd565d89218f30a4707a6dfd68 | |
| parent | a5fa3b21247ef211eb8225aec96cb7683d161ed2 (diff) | |
| parent | aacce208f76035a8f7453acc66a0b52e3434babd (diff) | |
| download | android_frameworks_ex-3f67d845af493927f81889b0ca4087a1c4a9871b.tar.gz android_frameworks_ex-3f67d845af493927f81889b0ca4087a1c4a9871b.tar.bz2 android_frameworks_ex-3f67d845af493927f81889b0ca4087a1c4a9871b.zip | |
am aacce208: Merge commit \'90e75d1f90b85e11f6905966ea28d59916935c68\' into lmp-mr1-dev
* commit 'aacce208f76035a8f7453acc66a0b52e3434babd':
Check isZoomSupported before any zoom ratio calculations.
| -rw-r--r-- | camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java | 2 |
1 files changed, 1 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..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,7 +47,6 @@ 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; mHorizontalViewAngle = p.getHorizontalViewAngle(); mVerticalViewAngle = p.getVerticalViewAngle(); buildPreviewFpsRange(p); @@ -60,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()) { |